diff --git a/.gitignore b/.gitignore index ddbe4d7eae0..e1164ec752f 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ target/ *.ipr *.iws *.iml +/.gradle/ diff --git a/build.gradle b/build.gradle index faf4ba89be4..a7e119e2df1 100644 --- a/build.gradle +++ b/build.gradle @@ -82,15 +82,13 @@ allprojects { // Also, build and use ManualTaglet as a taglet. tasks.withType(Javadoc) { dependsOn(':checker:shadowJar') - dependsOn(':javacutil:tagletClasses') + dependsOn(':util:tagletClasses') doFirst { options.encoding = 'UTF-8' options.memberLevel = javadocMemberLevel classpath += files(project(':checker').tasks.getByName('shadowJar').archivePath) - if (!project.name.toString().equals("javacutil")) { - options.taglets 'org.checkerframework.javacutil.dist.ManualTaglet' - options.tagletPath(project(':javacutil').sourceSets.taglet.output as File[]) - } + options.taglets 'org.checkerframework.taglet.ManualTaglet' + options.tagletPath(project(':util').sourceSets.taglet.output as File[]) options.links = ['http://docs.oracle.com/javase/8/docs/api/', 'https://docs.oracle.com/javase/8/docs/jdk/api/javac/tree/'] // This file is looked for by Javadoc. file("${destinationDir}/resources/fonts/").mkdirs() @@ -139,12 +137,13 @@ def createCheckTypeTask(projectName, checker, shortName) { project("${projectName}").tasks.create(name: "check${shortName}", type: JavaCompile, dependsOn: ':checker:shadowJar') { description "Run the ${shortName} Checker on the main sources." group 'Verification' + dependsOn ':jdk8:downloadJdk' // Always run the task. outputs.upToDateWhen { false } source = project("${projectName}").sourceSets.main.java - classpath = project("${projectName}").compileJava.classpath + classpath = files(project("${projectName}").compileJava.classpath,project(':checker-qual').sourceSets.main.output) destinationDir = file("${buildDir}") - dependsOn project(':checker-qual').tasks.jar + options.annotationProcessorPath = files(project(':checker').tasks.shadowJar.archivePath) options.compilerArgs += [ '-processor', "${checker}", @@ -166,8 +165,9 @@ def createCheckTypeTask(projectName, checker, shortName) { */ List getJavaFilesToFormat(projectName) { List javaFiles = new ArrayList<>(); - javaFiles.addAll(project(':' + projectName).sourceSets.main.java.files) - javaFiles.addAll(project(':' + projectName).sourceSets.test.java.files) + project(':' + projectName).sourceSets.forEach { set -> + javaFiles.addAll(set.java.files) + } // Collect all java files in tests directory fileTree("${project(projectName).projectDir}/tests").visit { details -> if (!details.path.contains("nullness-javac-errors") && details.name.endsWith('java')) { @@ -196,7 +196,7 @@ task htmlValidate(type: Exec) { task allJavadoc(type: Javadoc, group: "Documentation") { description = 'Generates a global API documentation for all the modules' dependsOn(':checker:shadowJar') - dependsOn(':javacutil:tagletClasses') + dependsOn(':util:tagletClasses') source(project(':checker').sourceSets.main.allJava, project(':framework').sourceSets.main.allJava, project(':dataflow').sourceSets.main.allJava, project(':javacutil').sourceSets.main.allJava) @@ -392,7 +392,7 @@ subprojects { } // Create a task for each JUnit test class whose name is the same as the JUnit class name. - sourceSets.test.allJava.filter { it.path.contains('s/src/tests') }.forEach { file -> + sourceSets.test.allJava.filter { it.path.contains('src/test/java/tests') }.forEach { file -> String junitClassName = file.name.replaceAll(".java", "") tasks.create(name: "${junitClassName}", type: Test) { description "Run ${junitClassName} tests." diff --git a/checker-qual/.classpath b/checker-qual/.classpath index f1eac147e9d..c4fb15c71d6 100644 --- a/checker-qual/.classpath +++ b/checker-qual/.classpath @@ -1,6 +1,6 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/checker-qual/.project b/checker-qual/.project index afc7eb64ba9..b4643d93bfd 100644 --- a/checker-qual/.project +++ b/checker-qual/.project @@ -1,7 +1,7 @@ checker-qual - Project checker-qual created by Buildship. + diff --git a/checker-qual/build.gradle b/checker-qual/build.gradle index e13c170bd32..30d8c080b13 100644 --- a/checker-qual/build.gradle +++ b/checker-qual/build.gradle @@ -1,15 +1,5 @@ sourceSets { - main { - java { - srcDirs = ['generated-src/main'] - } - } - - compatQual { - java { - srcDirs = ['generated-src/compat'] - } - } + compatQual } task copySources(type: Copy) { @@ -17,10 +7,10 @@ task copySources(type: Copy) { includeEmptyDirs = false doFirst { // Delete the directory in case a previously copied file should no longer be in checker-qual - delete file('generated-src/main/') + delete file('src/main/java') } - from files('../checker/src', '../dataflow/src', '../framework/src') + from files('../checker/src/main/java', '../dataflow/src/main/java', '../framework/src/main/java') include "**/FormatUtil.java" include "**/NullnessUtil.java" include "**/RegexUtil.java" @@ -35,7 +25,7 @@ task copySources(type: Copy) { // Make files read only. fileMode(0444) - into file('generated-src/main/') + into file('src/main/java') } compileJava { @@ -47,15 +37,15 @@ task copyCompatQual(type: Copy) { includeEmptyDirs = false doFirst { // Delete the directory in case a previously copied file should no longer be in checker-qual - delete file('generated-src/compat/') + delete file('src/compat/java') } - from files('../checker/src', '../framework/src') + from files('../checker/src/main/java', '../framework/src/main/java') include "**/compatqual/*.java" // Make files read only. fileMode(0444) - into file('generated-src/compat') + into file('src/compat/java') } compileCompatQualJava { diff --git a/checker/.classpath b/checker/.classpath index 31a62d1dd46..a24108098a8 100644 --- a/checker/.classpath +++ b/checker/.classpath @@ -1,10 +1,41 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checker/.project b/checker/.project index 2866588cbde..282f6f5b436 100644 --- a/checker/.project +++ b/checker/.project @@ -10,8 +10,14 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature diff --git a/checker/build.gradle b/checker/build.gradle index d5358294db9..824b8de8d2f 100644 --- a/checker/build.gradle +++ b/checker/build.gradle @@ -1,3 +1,14 @@ +sourceSets { + main { + resources { + // Stub files, message.properties, etc. + srcDirs = ['src/main/java'] + exclude '**/*.java' + } + } + testannotations +} + dependencies { compile project(':framework') compile project(':dataflow') @@ -5,24 +16,10 @@ dependencies { compile project(':checker-qual') testCompile group: 'junit', name: 'junit', version: '4.12' -} + testCompile project(':util') + testCompile sourceSets.testannotations.output -sourceSets { - main { - java { - srcDirs = ['src'] - } - resources { - // Stub files, message.properties, etc. - srcDirs = ['src'] - exclude '**/*.java' - } - } - test { - java { - srcDirs = ['tests/src', '../framework/src/org/checkerframework/framework/test'] - } - } + testannotationsCompile project(':checker-qual') } jar { diff --git a/checker/src/org/checkerframework/checker/compilermsgs/CompilerMessagesAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/CompilerMessagesAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/CompilerMessagesAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/CompilerMessagesAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/compilermsgs/CompilerMessagesChecker.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/CompilerMessagesChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/CompilerMessagesChecker.java rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/CompilerMessagesChecker.java diff --git a/checker/src/org/checkerframework/checker/compilermsgs/messages.properties b/checker/src/main/java/org/checkerframework/checker/compilermsgs/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/messages.properties rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/messages.properties diff --git a/checker/src/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java diff --git a/checker/src/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKeyBottom.java diff --git a/checker/src/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java b/checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java rename to checker/src/main/java/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java diff --git a/checker/src/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/fenum/FenumChecker.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/FenumChecker.java rename to checker/src/main/java/org/checkerframework/checker/fenum/FenumChecker.java diff --git a/checker/src/org/checkerframework/checker/fenum/FenumVisitor.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/FenumVisitor.java rename to checker/src/main/java/org/checkerframework/checker/fenum/FenumVisitor.java diff --git a/checker/src/org/checkerframework/checker/fenum/jdk.astub b/checker/src/main/java/org/checkerframework/checker/fenum/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/fenum/jdk.astub diff --git a/checker/src/org/checkerframework/checker/fenum/jdnc.astub b/checker/src/main/java/org/checkerframework/checker/fenum/jdnc.astub similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/jdnc.astub rename to checker/src/main/java/org/checkerframework/checker/fenum/jdnc.astub diff --git a/checker/src/org/checkerframework/checker/fenum/messages.properties b/checker/src/main/java/org/checkerframework/checker/fenum/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/messages.properties rename to checker/src/main/java/org/checkerframework/checker/fenum/messages.properties diff --git a/checker/src/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtAlphaCompositingRule.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/AwtColorSpace.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtColorSpace.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/AwtColorSpace.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtColorSpace.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/AwtCursorType.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtCursorType.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/AwtCursorType.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtCursorType.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/AwtFlowLayout.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/Fenum.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/Fenum.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/Fenum.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/Fenum.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/FenumBottom.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/FenumBottom.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumBottom.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/FenumTop.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumTop.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/FenumTop.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumTop.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/FenumUnqualified.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumUnqualified.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/FenumUnqualified.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/FenumUnqualified.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/PolyFenum.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/PolyFenum.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/PolyFenum.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/PolyFenum.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingCompassDirection.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingCompassDirection.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingCompassDirection.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingCompassDirection.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingElementOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingElementOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingElementOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingElementOrientation.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingHorizontalOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingHorizontalOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingHorizontalOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingHorizontalOrientation.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingSplitPaneOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingSplitPaneOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingSplitPaneOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingSplitPaneOrientation.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingTextOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTextOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingTextOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTextOrientation.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingTitleJustification.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTitleJustification.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingTitleJustification.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTitleJustification.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingTitlePosition.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTitlePosition.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingTitlePosition.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingTitlePosition.java diff --git a/checker/src/org/checkerframework/checker/fenum/qual/SwingVerticalOrientation.java b/checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingVerticalOrientation.java similarity index 100% rename from checker/src/org/checkerframework/checker/fenum/qual/SwingVerticalOrientation.java rename to checker/src/main/java/org/checkerframework/checker/fenum/qual/SwingVerticalOrientation.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatUtil.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatUtil.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatUtil.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatterAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatterAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatterAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatterAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatterChecker.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatterChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatterChecker.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatterChecker.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatterTransfer.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatterTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatterTransfer.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatterTransfer.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatterTreeUtil.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatterTreeUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatterTreeUtil.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatterTreeUtil.java diff --git a/checker/src/org/checkerframework/checker/formatter/FormatterVisitor.java b/checker/src/main/java/org/checkerframework/checker/formatter/FormatterVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/FormatterVisitor.java rename to checker/src/main/java/org/checkerframework/checker/formatter/FormatterVisitor.java diff --git a/checker/src/org/checkerframework/checker/formatter/jdk.astub b/checker/src/main/java/org/checkerframework/checker/formatter/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/formatter/jdk.astub diff --git a/checker/src/org/checkerframework/checker/formatter/messages.properties b/checker/src/main/java/org/checkerframework/checker/formatter/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/messages.properties rename to checker/src/main/java/org/checkerframework/checker/formatter/messages.properties diff --git a/checker/src/org/checkerframework/checker/formatter/qual/ConversionCategory.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/ConversionCategory.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/ConversionCategory.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/ConversionCategory.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/Format.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/Format.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/Format.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/Format.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/FormatBottom.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/FormatBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/FormatBottom.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/FormatBottom.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/FormatMethod.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/FormatMethod.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/FormatMethod.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/FormatMethod.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/InvalidFormat.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/InvalidFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/InvalidFormat.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/InvalidFormat.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/ReturnsFormat.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/ReturnsFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/ReturnsFormat.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/ReturnsFormat.java diff --git a/checker/src/org/checkerframework/checker/formatter/qual/UnknownFormat.java b/checker/src/main/java/org/checkerframework/checker/formatter/qual/UnknownFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/formatter/qual/UnknownFormat.java rename to checker/src/main/java/org/checkerframework/checker/formatter/qual/UnknownFormat.java diff --git a/checker/src/org/checkerframework/checker/guieffect/Effect.java b/checker/src/main/java/org/checkerframework/checker/guieffect/Effect.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/Effect.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/Effect.java diff --git a/checker/src/org/checkerframework/checker/guieffect/GuiEffectChecker.java b/checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/GuiEffectChecker.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectChecker.java diff --git a/checker/src/org/checkerframework/checker/guieffect/GuiEffectTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/GuiEffectTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/guieffect/GuiEffectVisitor.java b/checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/GuiEffectVisitor.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/GuiEffectVisitor.java diff --git a/checker/src/org/checkerframework/checker/guieffect/jdk.astub b/checker/src/main/java/org/checkerframework/checker/guieffect/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/guieffect/jdk.astub diff --git a/checker/src/org/checkerframework/checker/guieffect/messages.properties b/checker/src/main/java/org/checkerframework/checker/guieffect/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/messages.properties rename to checker/src/main/java/org/checkerframework/checker/guieffect/messages.properties diff --git a/checker/src/org/checkerframework/checker/guieffect/org-eclipse.astub b/checker/src/main/java/org/checkerframework/checker/guieffect/org-eclipse.astub similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/org-eclipse.astub rename to checker/src/main/java/org/checkerframework/checker/guieffect/org-eclipse.astub diff --git a/checker/src/org/checkerframework/checker/guieffect/org-osgi.astub b/checker/src/main/java/org/checkerframework/checker/guieffect/org-osgi.astub similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/org-osgi.astub rename to checker/src/main/java/org/checkerframework/checker/guieffect/org-osgi.astub diff --git a/checker/src/org/checkerframework/checker/guieffect/org-swtchart.astub b/checker/src/main/java/org/checkerframework/checker/guieffect/org-swtchart.astub similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/org-swtchart.astub rename to checker/src/main/java/org/checkerframework/checker/guieffect/org-swtchart.astub diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/AlwaysSafe.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/AlwaysSafe.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/AlwaysSafe.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/AlwaysSafe.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/PolyUI.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUI.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/PolyUI.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUI.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/PolyUIEffect.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUIEffect.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/PolyUIEffect.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUIEffect.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/PolyUIType.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUIType.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/PolyUIType.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/PolyUIType.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/SafeEffect.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/SafeEffect.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/SafeEffect.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/SafeEffect.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/SafeType.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/SafeType.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/SafeType.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/SafeType.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/UI.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/UI.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/UI.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/UI.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/UIEffect.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIEffect.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/UIEffect.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIEffect.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/UIPackage.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIPackage.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/UIPackage.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIPackage.java diff --git a/checker/src/org/checkerframework/checker/guieffect/qual/UIType.java b/checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIType.java similarity index 100% rename from checker/src/org/checkerframework/checker/guieffect/qual/UIType.java rename to checker/src/main/java/org/checkerframework/checker/guieffect/qual/UIType.java diff --git a/checker/src/org/checkerframework/checker/i18n/I18nAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/i18n/I18nAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/I18nAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/i18n/I18nAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/i18n/I18nChecker.java b/checker/src/main/java/org/checkerframework/checker/i18n/I18nChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/I18nChecker.java rename to checker/src/main/java/org/checkerframework/checker/i18n/I18nChecker.java diff --git a/checker/src/org/checkerframework/checker/i18n/I18nSubchecker.java b/checker/src/main/java/org/checkerframework/checker/i18n/I18nSubchecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/I18nSubchecker.java rename to checker/src/main/java/org/checkerframework/checker/i18n/I18nSubchecker.java diff --git a/checker/src/org/checkerframework/checker/i18n/LocalizableKeyAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/i18n/LocalizableKeyAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/LocalizableKeyAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/i18n/LocalizableKeyAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/i18n/LocalizableKeyChecker.java b/checker/src/main/java/org/checkerframework/checker/i18n/LocalizableKeyChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/LocalizableKeyChecker.java rename to checker/src/main/java/org/checkerframework/checker/i18n/LocalizableKeyChecker.java diff --git a/checker/src/org/checkerframework/checker/i18n/jdk.astub b/checker/src/main/java/org/checkerframework/checker/i18n/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/i18n/jdk.astub diff --git a/checker/src/org/checkerframework/checker/i18n/qual/LocalizableKey.java b/checker/src/main/java/org/checkerframework/checker/i18n/qual/LocalizableKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/qual/LocalizableKey.java rename to checker/src/main/java/org/checkerframework/checker/i18n/qual/LocalizableKey.java diff --git a/checker/src/org/checkerframework/checker/i18n/qual/LocalizableKeyBottom.java b/checker/src/main/java/org/checkerframework/checker/i18n/qual/LocalizableKeyBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/qual/LocalizableKeyBottom.java rename to checker/src/main/java/org/checkerframework/checker/i18n/qual/LocalizableKeyBottom.java diff --git a/checker/src/org/checkerframework/checker/i18n/qual/Localized.java b/checker/src/main/java/org/checkerframework/checker/i18n/qual/Localized.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/qual/Localized.java rename to checker/src/main/java/org/checkerframework/checker/i18n/qual/Localized.java diff --git a/checker/src/org/checkerframework/checker/i18n/qual/UnknownLocalizableKey.java b/checker/src/main/java/org/checkerframework/checker/i18n/qual/UnknownLocalizableKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/qual/UnknownLocalizableKey.java rename to checker/src/main/java/org/checkerframework/checker/i18n/qual/UnknownLocalizableKey.java diff --git a/checker/src/org/checkerframework/checker/i18n/qual/UnknownLocalized.java b/checker/src/main/java/org/checkerframework/checker/i18n/qual/UnknownLocalized.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18n/qual/UnknownLocalized.java rename to checker/src/main/java/org/checkerframework/checker/i18n/qual/UnknownLocalized.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatUtil.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatUtil.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatUtil.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterChecker.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterChecker.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterChecker.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterTransfer.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterTransfer.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterTransfer.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterTreeUtil.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterTreeUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterTreeUtil.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterTreeUtil.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterVisitor.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/I18nFormatterVisitor.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/I18nFormatterVisitor.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/jdk.astub b/checker/src/main/java/org/checkerframework/checker/i18nformatter/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/jdk.astub diff --git a/checker/src/org/checkerframework/checker/i18nformatter/messages.properties b/checker/src/main/java/org/checkerframework/checker/i18nformatter/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/messages.properties rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/messages.properties diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nChecksFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nChecksFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nChecksFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nChecksFormat.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nConversionCategory.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nConversionCategory.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nConversionCategory.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nConversionCategory.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormat.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormatBottom.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormatBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormatBottom.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormatBottom.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormatFor.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormatFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nFormatFor.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nFormatFor.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nInvalidFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nInvalidFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nInvalidFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nInvalidFormat.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nMakeFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nMakeFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nMakeFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nMakeFormat.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nUnknownFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nUnknownFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nUnknownFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nUnknownFormat.java diff --git a/checker/src/org/checkerframework/checker/i18nformatter/qual/I18nValidFormat.java b/checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nValidFormat.java similarity index 100% rename from checker/src/org/checkerframework/checker/i18nformatter/qual/I18nValidFormat.java rename to checker/src/main/java/org/checkerframework/checker/i18nformatter/qual/I18nValidFormat.java diff --git a/checker/src/org/checkerframework/checker/index/IndexAbstractTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/IndexAbstractTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/IndexAbstractTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/IndexAbstractTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/IndexChecker.java b/checker/src/main/java/org/checkerframework/checker/index/IndexChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/IndexChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/IndexChecker.java diff --git a/checker/src/org/checkerframework/checker/index/IndexMethodIdentifier.java b/checker/src/main/java/org/checkerframework/checker/index/IndexMethodIdentifier.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/IndexMethodIdentifier.java rename to checker/src/main/java/org/checkerframework/checker/index/IndexMethodIdentifier.java diff --git a/checker/src/org/checkerframework/checker/index/IndexRefinementInfo.java b/checker/src/main/java/org/checkerframework/checker/index/IndexRefinementInfo.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/IndexRefinementInfo.java rename to checker/src/main/java/org/checkerframework/checker/index/IndexRefinementInfo.java diff --git a/checker/src/org/checkerframework/checker/index/IndexUtil.java b/checker/src/main/java/org/checkerframework/checker/index/IndexUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/IndexUtil.java rename to checker/src/main/java/org/checkerframework/checker/index/IndexUtil.java diff --git a/checker/src/org/checkerframework/checker/index/OffsetDependentTypesHelper.java b/checker/src/main/java/org/checkerframework/checker/index/OffsetDependentTypesHelper.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/OffsetDependentTypesHelper.java rename to checker/src/main/java/org/checkerframework/checker/index/OffsetDependentTypesHelper.java diff --git a/checker/src/org/checkerframework/checker/index/inequality/LessThanAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/inequality/LessThanAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/inequality/LessThanChecker.java b/checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/inequality/LessThanChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanChecker.java diff --git a/checker/src/org/checkerframework/checker/index/inequality/LessThanTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/inequality/LessThanTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/inequality/LessThanVisitor.java b/checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/inequality/LessThanVisitor.java rename to checker/src/main/java/org/checkerframework/checker/index/inequality/LessThanVisitor.java diff --git a/checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundChecker.java b/checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundChecker.java diff --git a/checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundVisitor.java b/checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/lowerbound/LowerBoundVisitor.java rename to checker/src/main/java/org/checkerframework/checker/index/lowerbound/LowerBoundVisitor.java diff --git a/checker/src/org/checkerframework/checker/index/lowerbound/messages.properties b/checker/src/main/java/org/checkerframework/checker/index/lowerbound/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/index/lowerbound/messages.properties rename to checker/src/main/java/org/checkerframework/checker/index/lowerbound/messages.properties diff --git a/checker/src/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/EnsuresLTLengthOfIf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOfIf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/EnsuresLTLengthOfIf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/EnsuresLTLengthOfIf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/GTENegativeOne.java b/checker/src/main/java/org/checkerframework/checker/index/qual/GTENegativeOne.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/GTENegativeOne.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/GTENegativeOne.java diff --git a/checker/src/org/checkerframework/checker/index/qual/IndexFor.java b/checker/src/main/java/org/checkerframework/checker/index/qual/IndexFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/IndexFor.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/IndexFor.java diff --git a/checker/src/org/checkerframework/checker/index/qual/IndexOrHigh.java b/checker/src/main/java/org/checkerframework/checker/index/qual/IndexOrHigh.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/IndexOrHigh.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/IndexOrHigh.java diff --git a/checker/src/org/checkerframework/checker/index/qual/IndexOrLow.java b/checker/src/main/java/org/checkerframework/checker/index/qual/IndexOrLow.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/IndexOrLow.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/IndexOrLow.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LTEqLengthOf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LTEqLengthOf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LTEqLengthOf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LTEqLengthOf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LTLengthOf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LTLengthOf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LTLengthOf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LTLengthOf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LTOMLengthOf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LTOMLengthOf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LTOMLengthOf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LTOMLengthOf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LengthOf.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LengthOf.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LengthOf.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LengthOf.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LessThan.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LessThan.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LessThan.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LessThan.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LessThanBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LessThanBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LessThanBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LessThanBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LessThanUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LessThanUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LessThanUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LessThanUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LowerBoundBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LowerBoundBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LowerBoundBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LowerBoundBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/LowerBoundUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/LowerBoundUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/LowerBoundUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/LowerBoundUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/qual/NegativeIndexFor.java b/checker/src/main/java/org/checkerframework/checker/index/qual/NegativeIndexFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/NegativeIndexFor.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/NegativeIndexFor.java diff --git a/checker/src/org/checkerframework/checker/index/qual/NonNegative.java b/checker/src/main/java/org/checkerframework/checker/index/qual/NonNegative.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/NonNegative.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/NonNegative.java diff --git a/checker/src/org/checkerframework/checker/index/qual/PolyIndex.java b/checker/src/main/java/org/checkerframework/checker/index/qual/PolyIndex.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/PolyIndex.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/PolyIndex.java diff --git a/checker/src/org/checkerframework/checker/index/qual/PolyLength.java b/checker/src/main/java/org/checkerframework/checker/index/qual/PolyLength.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/PolyLength.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/PolyLength.java diff --git a/checker/src/org/checkerframework/checker/index/qual/PolyLowerBound.java b/checker/src/main/java/org/checkerframework/checker/index/qual/PolyLowerBound.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/PolyLowerBound.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/PolyLowerBound.java diff --git a/checker/src/org/checkerframework/checker/index/qual/PolySameLen.java b/checker/src/main/java/org/checkerframework/checker/index/qual/PolySameLen.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/PolySameLen.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/PolySameLen.java diff --git a/checker/src/org/checkerframework/checker/index/qual/PolyUpperBound.java b/checker/src/main/java/org/checkerframework/checker/index/qual/PolyUpperBound.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/PolyUpperBound.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/PolyUpperBound.java diff --git a/checker/src/org/checkerframework/checker/index/qual/Positive.java b/checker/src/main/java/org/checkerframework/checker/index/qual/Positive.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/Positive.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/Positive.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SameLen.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SameLen.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SameLen.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SameLen.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SameLenBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SameLenBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SameLenBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SameLenBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SameLenUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SameLenUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SameLenUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SameLenUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SearchIndexBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SearchIndexBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SearchIndexFor.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SearchIndexFor.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexFor.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SearchIndexUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SearchIndexUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SearchIndexUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SubstringIndexBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SubstringIndexBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SubstringIndexFor.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SubstringIndexFor.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexFor.java diff --git a/checker/src/org/checkerframework/checker/index/qual/SubstringIndexUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/SubstringIndexUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/SubstringIndexUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/qual/UpperBoundBottom.java b/checker/src/main/java/org/checkerframework/checker/index/qual/UpperBoundBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/UpperBoundBottom.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/UpperBoundBottom.java diff --git a/checker/src/org/checkerframework/checker/index/qual/UpperBoundUnknown.java b/checker/src/main/java/org/checkerframework/checker/index/qual/UpperBoundUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/qual/UpperBoundUnknown.java rename to checker/src/main/java/org/checkerframework/checker/index/qual/UpperBoundUnknown.java diff --git a/checker/src/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/samelen/SameLenChecker.java b/checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/samelen/SameLenChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenChecker.java diff --git a/checker/src/org/checkerframework/checker/index/samelen/SameLenTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/samelen/SameLenTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/samelen/SameLenVisitor.java b/checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/samelen/SameLenVisitor.java rename to checker/src/main/java/org/checkerframework/checker/index/samelen/SameLenVisitor.java diff --git a/checker/src/org/checkerframework/checker/index/searchindex/SearchIndexAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/searchindex/SearchIndexAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/searchindex/SearchIndexChecker.java b/checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/searchindex/SearchIndexChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexChecker.java diff --git a/checker/src/org/checkerframework/checker/index/searchindex/SearchIndexTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/searchindex/SearchIndexTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/searchindex/SearchIndexTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/substringindex/SubstringIndexAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/substringindex/SubstringIndexAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/substringindex/SubstringIndexAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/substringindex/SubstringIndexAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/substringindex/SubstringIndexChecker.java b/checker/src/main/java/org/checkerframework/checker/index/substringindex/SubstringIndexChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/substringindex/SubstringIndexChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/substringindex/SubstringIndexChecker.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/OffsetEquation.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/OffsetEquation.java similarity index 99% rename from checker/src/org/checkerframework/checker/index/upperbound/OffsetEquation.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/OffsetEquation.java index b00b3324e54..d0a5cd8f8eb 100644 --- a/checker/src/org/checkerframework/checker/index/upperbound/OffsetEquation.java +++ b/checker/src/main/java/org/checkerframework/checker/index/upperbound/OffsetEquation.java @@ -17,9 +17,9 @@ import org.checkerframework.framework.util.FlowExpressionParseUtil; import org.checkerframework.framework.util.FlowExpressionParseUtil.FlowExpressionContext; import org.checkerframework.framework.util.FlowExpressionParseUtil.FlowExpressionParseException; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.framework.util.dependenttypes.DependentTypesError; import org.checkerframework.javacutil.AnnotationProvider; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; /** diff --git a/checker/src/org/checkerframework/checker/index/upperbound/UBQualifier.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/UBQualifier.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/UBQualifier.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/UBQualifier.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/UpperBoundChecker.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/UpperBoundChecker.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundChecker.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/UpperBoundTransfer.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/UpperBoundTransfer.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundTransfer.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/UpperBoundVisitor.java b/checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/UpperBoundVisitor.java rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/UpperBoundVisitor.java diff --git a/checker/src/org/checkerframework/checker/index/upperbound/messages.properties b/checker/src/main/java/org/checkerframework/checker/index/upperbound/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/index/upperbound/messages.properties rename to checker/src/main/java/org/checkerframework/checker/index/upperbound/messages.properties diff --git a/checker/src/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/initialization/InitializationChecker.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/InitializationChecker.java rename to checker/src/main/java/org/checkerframework/checker/initialization/InitializationChecker.java diff --git a/checker/src/org/checkerframework/checker/initialization/InitializationStore.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationStore.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/InitializationStore.java rename to checker/src/main/java/org/checkerframework/checker/initialization/InitializationStore.java diff --git a/checker/src/org/checkerframework/checker/initialization/InitializationTransfer.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/InitializationTransfer.java rename to checker/src/main/java/org/checkerframework/checker/initialization/InitializationTransfer.java diff --git a/checker/src/org/checkerframework/checker/initialization/InitializationVisitor.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/InitializationVisitor.java rename to checker/src/main/java/org/checkerframework/checker/initialization/InitializationVisitor.java diff --git a/checker/src/org/checkerframework/checker/initialization/messages.properties b/checker/src/main/java/org/checkerframework/checker/initialization/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/messages.properties rename to checker/src/main/java/org/checkerframework/checker/initialization/messages.properties diff --git a/checker/src/org/checkerframework/checker/initialization/qual/FBCBottom.java b/checker/src/main/java/org/checkerframework/checker/initialization/qual/FBCBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/qual/FBCBottom.java rename to checker/src/main/java/org/checkerframework/checker/initialization/qual/FBCBottom.java diff --git a/checker/src/org/checkerframework/checker/initialization/qual/Initialized.java b/checker/src/main/java/org/checkerframework/checker/initialization/qual/Initialized.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/qual/Initialized.java rename to checker/src/main/java/org/checkerframework/checker/initialization/qual/Initialized.java diff --git a/checker/src/org/checkerframework/checker/initialization/qual/NotOnlyInitialized.java b/checker/src/main/java/org/checkerframework/checker/initialization/qual/NotOnlyInitialized.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/qual/NotOnlyInitialized.java rename to checker/src/main/java/org/checkerframework/checker/initialization/qual/NotOnlyInitialized.java diff --git a/checker/src/org/checkerframework/checker/initialization/qual/UnderInitialization.java b/checker/src/main/java/org/checkerframework/checker/initialization/qual/UnderInitialization.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/qual/UnderInitialization.java rename to checker/src/main/java/org/checkerframework/checker/initialization/qual/UnderInitialization.java diff --git a/checker/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java b/checker/src/main/java/org/checkerframework/checker/initialization/qual/UnknownInitialization.java similarity index 100% rename from checker/src/org/checkerframework/checker/initialization/qual/UnknownInitialization.java rename to checker/src/main/java/org/checkerframework/checker/initialization/qual/UnknownInitialization.java diff --git a/checker/src/org/checkerframework/checker/interning/InterningAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/interning/InterningAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/InterningAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/interning/InterningAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/interning/InterningChecker.java b/checker/src/main/java/org/checkerframework/checker/interning/InterningChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/InterningChecker.java rename to checker/src/main/java/org/checkerframework/checker/interning/InterningChecker.java diff --git a/checker/src/org/checkerframework/checker/interning/InterningVisitor.java b/checker/src/main/java/org/checkerframework/checker/interning/InterningVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/InterningVisitor.java rename to checker/src/main/java/org/checkerframework/checker/interning/InterningVisitor.java diff --git a/checker/src/org/checkerframework/checker/interning/com-sun.astub b/checker/src/main/java/org/checkerframework/checker/interning/com-sun.astub similarity index 100% rename from checker/src/org/checkerframework/checker/interning/com-sun.astub rename to checker/src/main/java/org/checkerframework/checker/interning/com-sun.astub diff --git a/checker/src/org/checkerframework/checker/interning/jdk.astub b/checker/src/main/java/org/checkerframework/checker/interning/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/interning/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/interning/jdk.astub diff --git a/checker/src/org/checkerframework/checker/interning/messages.properties b/checker/src/main/java/org/checkerframework/checker/interning/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/interning/messages.properties rename to checker/src/main/java/org/checkerframework/checker/interning/messages.properties diff --git a/checker/src/org/checkerframework/checker/interning/org-jcp.astub b/checker/src/main/java/org/checkerframework/checker/interning/org-jcp.astub similarity index 100% rename from checker/src/org/checkerframework/checker/interning/org-jcp.astub rename to checker/src/main/java/org/checkerframework/checker/interning/org-jcp.astub diff --git a/checker/src/org/checkerframework/checker/interning/org-xml.astub b/checker/src/main/java/org/checkerframework/checker/interning/org-xml.astub similarity index 100% rename from checker/src/org/checkerframework/checker/interning/org-xml.astub rename to checker/src/main/java/org/checkerframework/checker/interning/org-xml.astub diff --git a/checker/src/org/checkerframework/checker/interning/package-info.java b/checker/src/main/java/org/checkerframework/checker/interning/package-info.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/package-info.java rename to checker/src/main/java/org/checkerframework/checker/interning/package-info.java diff --git a/checker/src/org/checkerframework/checker/interning/qual/Interned.java b/checker/src/main/java/org/checkerframework/checker/interning/qual/Interned.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/qual/Interned.java rename to checker/src/main/java/org/checkerframework/checker/interning/qual/Interned.java diff --git a/checker/src/org/checkerframework/checker/interning/qual/InternedDistinct.java b/checker/src/main/java/org/checkerframework/checker/interning/qual/InternedDistinct.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/qual/InternedDistinct.java rename to checker/src/main/java/org/checkerframework/checker/interning/qual/InternedDistinct.java diff --git a/checker/src/org/checkerframework/checker/interning/qual/PolyInterned.java b/checker/src/main/java/org/checkerframework/checker/interning/qual/PolyInterned.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/qual/PolyInterned.java rename to checker/src/main/java/org/checkerframework/checker/interning/qual/PolyInterned.java diff --git a/checker/src/org/checkerframework/checker/interning/qual/UnknownInterned.java b/checker/src/main/java/org/checkerframework/checker/interning/qual/UnknownInterned.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/qual/UnknownInterned.java rename to checker/src/main/java/org/checkerframework/checker/interning/qual/UnknownInterned.java diff --git a/checker/src/org/checkerframework/checker/interning/qual/UsesObjectEquals.java b/checker/src/main/java/org/checkerframework/checker/interning/qual/UsesObjectEquals.java similarity index 100% rename from checker/src/org/checkerframework/checker/interning/qual/UsesObjectEquals.java rename to checker/src/main/java/org/checkerframework/checker/interning/qual/UsesObjectEquals.java diff --git a/checker/src/org/checkerframework/checker/interning/sun.astub b/checker/src/main/java/org/checkerframework/checker/interning/sun.astub similarity index 100% rename from checker/src/org/checkerframework/checker/interning/sun.astub rename to checker/src/main/java/org/checkerframework/checker/interning/sun.astub diff --git a/checker/src/org/checkerframework/checker/lock/LockAnalysis.java b/checker/src/main/java/org/checkerframework/checker/lock/LockAnalysis.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockAnalysis.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockAnalysis.java diff --git a/checker/src/org/checkerframework/checker/lock/LockAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/lock/LockAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/lock/LockChecker.java b/checker/src/main/java/org/checkerframework/checker/lock/LockChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockChecker.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockChecker.java diff --git a/checker/src/org/checkerframework/checker/lock/LockStore.java b/checker/src/main/java/org/checkerframework/checker/lock/LockStore.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockStore.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockStore.java diff --git a/checker/src/org/checkerframework/checker/lock/LockTransfer.java b/checker/src/main/java/org/checkerframework/checker/lock/LockTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockTransfer.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockTransfer.java diff --git a/checker/src/org/checkerframework/checker/lock/LockTreeAnnotator.java b/checker/src/main/java/org/checkerframework/checker/lock/LockTreeAnnotator.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockTreeAnnotator.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockTreeAnnotator.java diff --git a/checker/src/org/checkerframework/checker/lock/LockVisitor.java b/checker/src/main/java/org/checkerframework/checker/lock/LockVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/LockVisitor.java rename to checker/src/main/java/org/checkerframework/checker/lock/LockVisitor.java diff --git a/checker/src/org/checkerframework/checker/lock/messages.properties b/checker/src/main/java/org/checkerframework/checker/lock/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/lock/messages.properties rename to checker/src/main/java/org/checkerframework/checker/lock/messages.properties diff --git a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/EnsuresLockHeld.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/EnsuresLockHeldIf.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/GuardSatisfied.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/GuardSatisfied.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/GuardSatisfied.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/GuardSatisfied.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedBy.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/GuardedBy.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedBy.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/GuardedByBottom.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedByBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/GuardedByBottom.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedByBottom.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/GuardedByUnknown.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedByUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/GuardedByUnknown.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/GuardedByUnknown.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/Holding.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/Holding.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/Holding.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/Holding.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/LockHeld.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/LockHeld.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/LockHeld.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/LockHeld.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/LockPossiblyHeld.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/LockPossiblyHeld.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/LockPossiblyHeld.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/LockPossiblyHeld.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/LockingFree.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/LockingFree.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/LockingFree.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/LockingFree.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/MayReleaseLocks.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/MayReleaseLocks.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/MayReleaseLocks.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/MayReleaseLocks.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/PolyGuardedBy.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/PolyGuardedBy.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/PolyGuardedBy.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/PolyGuardedBy.java diff --git a/checker/src/org/checkerframework/checker/lock/qual/ReleasesNoLocks.java b/checker/src/main/java/org/checkerframework/checker/lock/qual/ReleasesNoLocks.java similarity index 100% rename from checker/src/org/checkerframework/checker/lock/qual/ReleasesNoLocks.java rename to checker/src/main/java/org/checkerframework/checker/lock/qual/ReleasesNoLocks.java diff --git a/checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java b/checker/src/main/java/org/checkerframework/checker/nullness/AbstractNullnessChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/AbstractNullnessChecker.java rename to checker/src/main/java/org/checkerframework/checker/nullness/AbstractNullnessChecker.java diff --git a/checker/src/org/checkerframework/checker/nullness/CollectionToArrayHeuristics.java b/checker/src/main/java/org/checkerframework/checker/nullness/CollectionToArrayHeuristics.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/CollectionToArrayHeuristics.java rename to checker/src/main/java/org/checkerframework/checker/nullness/CollectionToArrayHeuristics.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForAnalysis.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForAnalysis.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForAnalysis.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForAnalysis.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForPropagationTreeAnnotator.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForPropagationTreeAnnotator.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForPropagationTreeAnnotator.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForPropagationTreeAnnotator.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForPropagator.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForPropagator.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForPropagator.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForPropagator.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForStore.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForStore.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForStore.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForStore.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForSubchecker.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForSubchecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForSubchecker.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForSubchecker.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForTransfer.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForTransfer.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForTransfer.java diff --git a/checker/src/org/checkerframework/checker/nullness/KeyForValue.java b/checker/src/main/java/org/checkerframework/checker/nullness/KeyForValue.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/KeyForValue.java rename to checker/src/main/java/org/checkerframework/checker/nullness/KeyForValue.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessAnalysis.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnalysis.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessAnalysis.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnalysis.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFormatter.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFormatter.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFormatter.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessAnnotatedTypeFormatter.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessChecker.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessChecker.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessChecker.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessRawnessChecker.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessRawnessChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessRawnessChecker.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessRawnessChecker.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessStore.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessStore.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessStore.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessStore.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessTransfer.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessTransfer.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessTransfer.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessUtil.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessUtil.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessUtil.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessValue.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessValue.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessValue.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessValue.java diff --git a/checker/src/org/checkerframework/checker/nullness/NullnessVisitor.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/NullnessVisitor.java rename to checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java diff --git a/checker/src/org/checkerframework/checker/nullness/Opt.java b/checker/src/main/java/org/checkerframework/checker/nullness/Opt.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/Opt.java rename to checker/src/main/java/org/checkerframework/checker/nullness/Opt.java diff --git a/checker/src/org/checkerframework/checker/nullness/SystemGetPropertyHandler.java b/checker/src/main/java/org/checkerframework/checker/nullness/SystemGetPropertyHandler.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/SystemGetPropertyHandler.java rename to checker/src/main/java/org/checkerframework/checker/nullness/SystemGetPropertyHandler.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/KeyForDecl.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/KeyForDecl.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/KeyForDecl.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/KeyForDecl.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/KeyForType.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/KeyForType.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/KeyForType.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/KeyForType.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullDecl.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullDecl.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullDecl.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullDecl.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullType.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullType.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullType.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/MonotonicNonNullType.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/NonNullDecl.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NonNullDecl.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/NonNullDecl.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NonNullDecl.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/NonNullType.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NonNullType.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/NonNullType.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NonNullType.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NullableDecl.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NullableDecl.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/NullableType.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NullableType.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/NullableType.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/NullableType.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/PolyNullDecl.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/PolyNullDecl.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/PolyNullDecl.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/PolyNullDecl.java diff --git a/checker/src/org/checkerframework/checker/nullness/compatqual/PolyNullType.java b/checker/src/main/java/org/checkerframework/checker/nullness/compatqual/PolyNullType.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/compatqual/PolyNullType.java rename to checker/src/main/java/org/checkerframework/checker/nullness/compatqual/PolyNullType.java diff --git a/checker/src/org/checkerframework/checker/nullness/messages.properties b/checker/src/main/java/org/checkerframework/checker/nullness/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/messages.properties rename to checker/src/main/java/org/checkerframework/checker/nullness/messages.properties diff --git a/checker/src/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/EnsuresNonNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/EnsuresNonNullIf.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/KeyFor.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/KeyFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/KeyFor.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/KeyFor.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/KeyForBottom.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/KeyForBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/KeyForBottom.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/KeyForBottom.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/MonotonicNonNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/NonNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/NonNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/NonNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/NonNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/NonRaw.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/NonRaw.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/NonRaw.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/NonRaw.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/Nullable.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/Nullable.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/Nullable.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/Nullable.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/PolyKeyFor.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyKeyFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/PolyKeyFor.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyKeyFor.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/PolyNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/PolyNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/PolyRaw.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyRaw.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/PolyRaw.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/PolyRaw.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/Raw.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/Raw.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/Raw.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/Raw.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/RequiresNonNull.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/RequiresNonNull.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/RequiresNonNull.java diff --git a/checker/src/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java b/checker/src/main/java/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java similarity index 100% rename from checker/src/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java rename to checker/src/main/java/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java diff --git a/checker/src/org/checkerframework/checker/optional/OptionalChecker.java b/checker/src/main/java/org/checkerframework/checker/optional/OptionalChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/optional/OptionalChecker.java rename to checker/src/main/java/org/checkerframework/checker/optional/OptionalChecker.java diff --git a/checker/src/org/checkerframework/checker/optional/OptionalVisitor.java b/checker/src/main/java/org/checkerframework/checker/optional/OptionalVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/optional/OptionalVisitor.java rename to checker/src/main/java/org/checkerframework/checker/optional/OptionalVisitor.java diff --git a/checker/src/org/checkerframework/checker/optional/messages.properties b/checker/src/main/java/org/checkerframework/checker/optional/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/optional/messages.properties rename to checker/src/main/java/org/checkerframework/checker/optional/messages.properties diff --git a/checker/src/org/checkerframework/checker/optional/qual/MaybePresent.java b/checker/src/main/java/org/checkerframework/checker/optional/qual/MaybePresent.java similarity index 100% rename from checker/src/org/checkerframework/checker/optional/qual/MaybePresent.java rename to checker/src/main/java/org/checkerframework/checker/optional/qual/MaybePresent.java diff --git a/checker/src/org/checkerframework/checker/optional/qual/PolyPresent.java b/checker/src/main/java/org/checkerframework/checker/optional/qual/PolyPresent.java similarity index 100% rename from checker/src/org/checkerframework/checker/optional/qual/PolyPresent.java rename to checker/src/main/java/org/checkerframework/checker/optional/qual/PolyPresent.java diff --git a/checker/src/org/checkerframework/checker/optional/qual/Present.java b/checker/src/main/java/org/checkerframework/checker/optional/qual/Present.java similarity index 100% rename from checker/src/org/checkerframework/checker/optional/qual/Present.java rename to checker/src/main/java/org/checkerframework/checker/optional/qual/Present.java diff --git a/checker/src/org/checkerframework/checker/propkey/PropertyKeyAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/propkey/PropertyKeyAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/PropertyKeyAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/propkey/PropertyKeyAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/propkey/PropertyKeyChecker.java b/checker/src/main/java/org/checkerframework/checker/propkey/PropertyKeyChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/PropertyKeyChecker.java rename to checker/src/main/java/org/checkerframework/checker/propkey/PropertyKeyChecker.java diff --git a/checker/src/org/checkerframework/checker/propkey/jdk.astub b/checker/src/main/java/org/checkerframework/checker/propkey/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/propkey/jdk.astub diff --git a/checker/src/org/checkerframework/checker/propkey/qual/PropertyKey.java b/checker/src/main/java/org/checkerframework/checker/propkey/qual/PropertyKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/qual/PropertyKey.java rename to checker/src/main/java/org/checkerframework/checker/propkey/qual/PropertyKey.java diff --git a/checker/src/org/checkerframework/checker/propkey/qual/PropertyKeyBottom.java b/checker/src/main/java/org/checkerframework/checker/propkey/qual/PropertyKeyBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/qual/PropertyKeyBottom.java rename to checker/src/main/java/org/checkerframework/checker/propkey/qual/PropertyKeyBottom.java diff --git a/checker/src/org/checkerframework/checker/propkey/qual/UnknownPropertyKey.java b/checker/src/main/java/org/checkerframework/checker/propkey/qual/UnknownPropertyKey.java similarity index 100% rename from checker/src/org/checkerframework/checker/propkey/qual/UnknownPropertyKey.java rename to checker/src/main/java/org/checkerframework/checker/propkey/qual/UnknownPropertyKey.java diff --git a/checker/src/org/checkerframework/checker/regex/RegexAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/regex/RegexAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/RegexAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/regex/RegexAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/regex/RegexChecker.java b/checker/src/main/java/org/checkerframework/checker/regex/RegexChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/RegexChecker.java rename to checker/src/main/java/org/checkerframework/checker/regex/RegexChecker.java diff --git a/checker/src/org/checkerframework/checker/regex/RegexTransfer.java b/checker/src/main/java/org/checkerframework/checker/regex/RegexTransfer.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/RegexTransfer.java rename to checker/src/main/java/org/checkerframework/checker/regex/RegexTransfer.java diff --git a/checker/src/org/checkerframework/checker/regex/RegexUtil.java b/checker/src/main/java/org/checkerframework/checker/regex/RegexUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/RegexUtil.java rename to checker/src/main/java/org/checkerframework/checker/regex/RegexUtil.java diff --git a/checker/src/org/checkerframework/checker/regex/RegexVisitor.java b/checker/src/main/java/org/checkerframework/checker/regex/RegexVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/RegexVisitor.java rename to checker/src/main/java/org/checkerframework/checker/regex/RegexVisitor.java diff --git a/checker/src/org/checkerframework/checker/regex/apache-xerces.astub b/checker/src/main/java/org/checkerframework/checker/regex/apache-xerces.astub similarity index 100% rename from checker/src/org/checkerframework/checker/regex/apache-xerces.astub rename to checker/src/main/java/org/checkerframework/checker/regex/apache-xerces.astub diff --git a/checker/src/org/checkerframework/checker/regex/jdk.astub b/checker/src/main/java/org/checkerframework/checker/regex/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/regex/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/regex/jdk.astub diff --git a/checker/src/org/checkerframework/checker/regex/messages.properties b/checker/src/main/java/org/checkerframework/checker/regex/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/regex/messages.properties rename to checker/src/main/java/org/checkerframework/checker/regex/messages.properties diff --git a/checker/src/org/checkerframework/checker/regex/qual/PartialRegex.java b/checker/src/main/java/org/checkerframework/checker/regex/qual/PartialRegex.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/qual/PartialRegex.java rename to checker/src/main/java/org/checkerframework/checker/regex/qual/PartialRegex.java diff --git a/checker/src/org/checkerframework/checker/regex/qual/PolyRegex.java b/checker/src/main/java/org/checkerframework/checker/regex/qual/PolyRegex.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/qual/PolyRegex.java rename to checker/src/main/java/org/checkerframework/checker/regex/qual/PolyRegex.java diff --git a/checker/src/org/checkerframework/checker/regex/qual/Regex.java b/checker/src/main/java/org/checkerframework/checker/regex/qual/Regex.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/qual/Regex.java rename to checker/src/main/java/org/checkerframework/checker/regex/qual/Regex.java diff --git a/checker/src/org/checkerframework/checker/regex/qual/RegexBottom.java b/checker/src/main/java/org/checkerframework/checker/regex/qual/RegexBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/qual/RegexBottom.java rename to checker/src/main/java/org/checkerframework/checker/regex/qual/RegexBottom.java diff --git a/checker/src/org/checkerframework/checker/regex/qual/UnknownRegex.java b/checker/src/main/java/org/checkerframework/checker/regex/qual/UnknownRegex.java similarity index 100% rename from checker/src/org/checkerframework/checker/regex/qual/UnknownRegex.java rename to checker/src/main/java/org/checkerframework/checker/regex/qual/UnknownRegex.java diff --git a/checker/src/org/checkerframework/checker/signature/SignatureAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/signature/SignatureAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/SignatureAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/signature/SignatureAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/signature/SignatureChecker.java b/checker/src/main/java/org/checkerframework/checker/signature/SignatureChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/SignatureChecker.java rename to checker/src/main/java/org/checkerframework/checker/signature/SignatureChecker.java diff --git a/checker/src/org/checkerframework/checker/signature/jdk.astub b/checker/src/main/java/org/checkerframework/checker/signature/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/signature/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/signature/jdk.astub diff --git a/checker/src/org/checkerframework/checker/signature/qual/BinaryName.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryName.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/BinaryName.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryName.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/BinaryNameForNonArray.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameForNonArray.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/BinaryNameForNonArray.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameForNonArray.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/BinaryNameForNonArrayInUnnamedPackage.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameForNonArrayInUnnamedPackage.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/BinaryNameForNonArrayInUnnamedPackage.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameForNonArrayInUnnamedPackage.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/BinaryNameInUnnamedPackage.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameInUnnamedPackage.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/BinaryNameInUnnamedPackage.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/BinaryNameInUnnamedPackage.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/ClassGetName.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/ClassGetName.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/ClassGetName.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/ClassGetName.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/ClassGetSimpleName.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/ClassGetSimpleName.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/ClassGetSimpleName.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/ClassGetSimpleName.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/FieldDescriptor.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/FieldDescriptor.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/FieldDescriptor.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/FieldDescriptor.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/FieldDescriptorForArray.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/FieldDescriptorForArray.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/FieldDescriptorForArray.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/FieldDescriptorForArray.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/FullyQualifiedName.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/FullyQualifiedName.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/FullyQualifiedName.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/FullyQualifiedName.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/Identifier.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/Identifier.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/Identifier.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/Identifier.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/IdentifierOrArray.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/IdentifierOrArray.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/IdentifierOrArray.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/IdentifierOrArray.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/InternalForm.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/InternalForm.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/InternalForm.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/InternalForm.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/InternalFormForNonArray.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/InternalFormForNonArray.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/InternalFormForNonArray.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/InternalFormForNonArray.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/MethodDescriptor.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/MethodDescriptor.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/MethodDescriptor.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/MethodDescriptor.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/PolySignature.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/PolySignature.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/PolySignature.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/PolySignature.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/SignatureBottom.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/SignatureBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/SignatureBottom.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/SignatureBottom.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/SignatureUnknown.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/SignatureUnknown.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/SignatureUnknown.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/SignatureUnknown.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/SourceNameForNonArrayNonInner.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/SourceNameForNonArrayNonInner.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/SourceNameForNonArrayNonInner.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/SourceNameForNonArrayNonInner.java diff --git a/checker/src/org/checkerframework/checker/signature/qual/SourceNameForNonInner.java b/checker/src/main/java/org/checkerframework/checker/signature/qual/SourceNameForNonInner.java similarity index 100% rename from checker/src/org/checkerframework/checker/signature/qual/SourceNameForNonInner.java rename to checker/src/main/java/org/checkerframework/checker/signature/qual/SourceNameForNonInner.java diff --git a/checker/src/org/checkerframework/checker/signedness/SignednessAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/signedness/SignednessAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/SignednessAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/signedness/SignednessAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/signedness/SignednessChecker.java b/checker/src/main/java/org/checkerframework/checker/signedness/SignednessChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/SignednessChecker.java rename to checker/src/main/java/org/checkerframework/checker/signedness/SignednessChecker.java diff --git a/checker/src/org/checkerframework/checker/signedness/SignednessUtil.java b/checker/src/main/java/org/checkerframework/checker/signedness/SignednessUtil.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/SignednessUtil.java rename to checker/src/main/java/org/checkerframework/checker/signedness/SignednessUtil.java diff --git a/checker/src/org/checkerframework/checker/signedness/SignednessVisitor.java b/checker/src/main/java/org/checkerframework/checker/signedness/SignednessVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/SignednessVisitor.java rename to checker/src/main/java/org/checkerframework/checker/signedness/SignednessVisitor.java diff --git a/checker/src/org/checkerframework/checker/signedness/jdk.astub b/checker/src/main/java/org/checkerframework/checker/signedness/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/signedness/jdk.astub diff --git a/checker/src/org/checkerframework/checker/signedness/messages.properties b/checker/src/main/java/org/checkerframework/checker/signedness/messages.properties similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/messages.properties rename to checker/src/main/java/org/checkerframework/checker/signedness/messages.properties diff --git a/checker/src/org/checkerframework/checker/signedness/qual/Constant.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/Constant.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/Constant.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/Constant.java diff --git a/checker/src/org/checkerframework/checker/signedness/qual/PolySignedness.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/PolySignedness.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/PolySignedness.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/PolySignedness.java diff --git a/checker/src/org/checkerframework/checker/signedness/qual/Signed.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/Signed.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/Signed.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/Signed.java diff --git a/checker/src/org/checkerframework/checker/signedness/qual/SignednessBottom.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/SignednessBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/SignednessBottom.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/SignednessBottom.java diff --git a/checker/src/org/checkerframework/checker/signedness/qual/UnknownSignedness.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/UnknownSignedness.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/UnknownSignedness.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/UnknownSignedness.java diff --git a/checker/src/org/checkerframework/checker/signedness/qual/Unsigned.java b/checker/src/main/java/org/checkerframework/checker/signedness/qual/Unsigned.java similarity index 100% rename from checker/src/org/checkerframework/checker/signedness/qual/Unsigned.java rename to checker/src/main/java/org/checkerframework/checker/signedness/qual/Unsigned.java diff --git a/checker/src/org/checkerframework/checker/tainting/TaintingChecker.java b/checker/src/main/java/org/checkerframework/checker/tainting/TaintingChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/tainting/TaintingChecker.java rename to checker/src/main/java/org/checkerframework/checker/tainting/TaintingChecker.java diff --git a/checker/src/org/checkerframework/checker/tainting/jdk.astub b/checker/src/main/java/org/checkerframework/checker/tainting/jdk.astub similarity index 100% rename from checker/src/org/checkerframework/checker/tainting/jdk.astub rename to checker/src/main/java/org/checkerframework/checker/tainting/jdk.astub diff --git a/checker/src/org/checkerframework/checker/tainting/qual/PolyTainted.java b/checker/src/main/java/org/checkerframework/checker/tainting/qual/PolyTainted.java similarity index 100% rename from checker/src/org/checkerframework/checker/tainting/qual/PolyTainted.java rename to checker/src/main/java/org/checkerframework/checker/tainting/qual/PolyTainted.java diff --git a/checker/src/org/checkerframework/checker/tainting/qual/Tainted.java b/checker/src/main/java/org/checkerframework/checker/tainting/qual/Tainted.java similarity index 100% rename from checker/src/org/checkerframework/checker/tainting/qual/Tainted.java rename to checker/src/main/java/org/checkerframework/checker/tainting/qual/Tainted.java diff --git a/checker/src/org/checkerframework/checker/tainting/qual/Untainted.java b/checker/src/main/java/org/checkerframework/checker/tainting/qual/Untainted.java similarity index 100% rename from checker/src/org/checkerframework/checker/tainting/qual/Untainted.java rename to checker/src/main/java/org/checkerframework/checker/tainting/qual/Untainted.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotatedTypeFactory.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsAnnotatedTypeFactory.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotatedTypeFactory.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsAnnotatedTypeFormatter.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotatedTypeFormatter.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsAnnotatedTypeFormatter.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotatedTypeFormatter.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsAnnotationClassLoader.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotationClassLoader.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsAnnotationClassLoader.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsAnnotationClassLoader.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsChecker.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsChecker.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsChecker.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsChecker.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsRelations.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsRelations.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsRelations.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsRelations.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsRelationsDefault.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsRelationsDefault.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsRelationsDefault.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsRelationsDefault.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsRelationsTools.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsRelationsTools.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsRelationsTools.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsRelationsTools.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsTools.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsTools.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsTools.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsTools.java diff --git a/checker/src/org/checkerframework/checker/units/UnitsVisitor.java b/checker/src/main/java/org/checkerframework/checker/units/UnitsVisitor.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/UnitsVisitor.java rename to checker/src/main/java/org/checkerframework/checker/units/UnitsVisitor.java diff --git a/checker/src/org/checkerframework/checker/units/qual/A.java b/checker/src/main/java/org/checkerframework/checker/units/qual/A.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/A.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/A.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Acceleration.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Acceleration.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Acceleration.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Acceleration.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Angle.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Angle.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Angle.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Angle.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Area.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Area.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Area.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Area.java diff --git a/checker/src/org/checkerframework/checker/units/qual/C.java b/checker/src/main/java/org/checkerframework/checker/units/qual/C.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/C.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/C.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Current.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Current.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Current.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Current.java diff --git a/checker/src/org/checkerframework/checker/units/qual/K.java b/checker/src/main/java/org/checkerframework/checker/units/qual/K.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/K.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/K.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Length.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Length.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Length.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Length.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Luminance.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Luminance.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Luminance.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Luminance.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Mass.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Mass.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Mass.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Mass.java diff --git a/checker/src/org/checkerframework/checker/units/qual/MixedUnits.java b/checker/src/main/java/org/checkerframework/checker/units/qual/MixedUnits.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/MixedUnits.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/MixedUnits.java diff --git a/checker/src/org/checkerframework/checker/units/qual/PolyUnit.java b/checker/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/PolyUnit.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/PolyUnit.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Prefix.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Prefix.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Prefix.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Prefix.java diff --git a/checker/src/org/checkerframework/checker/units/qual/README b/checker/src/main/java/org/checkerframework/checker/units/qual/README similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/README rename to checker/src/main/java/org/checkerframework/checker/units/qual/README diff --git a/checker/src/org/checkerframework/checker/units/qual/Speed.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Speed.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Speed.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Speed.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Substance.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Substance.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Substance.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Substance.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Temperature.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Temperature.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Temperature.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Temperature.java diff --git a/checker/src/org/checkerframework/checker/units/qual/Time.java b/checker/src/main/java/org/checkerframework/checker/units/qual/Time.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/Time.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/Time.java diff --git a/checker/src/org/checkerframework/checker/units/qual/UnitsBottom.java b/checker/src/main/java/org/checkerframework/checker/units/qual/UnitsBottom.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/UnitsBottom.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/UnitsBottom.java diff --git a/checker/src/org/checkerframework/checker/units/qual/UnitsMultiple.java b/checker/src/main/java/org/checkerframework/checker/units/qual/UnitsMultiple.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/UnitsMultiple.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/UnitsMultiple.java diff --git a/checker/src/org/checkerframework/checker/units/qual/UnitsRelations.java b/checker/src/main/java/org/checkerframework/checker/units/qual/UnitsRelations.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/UnitsRelations.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/UnitsRelations.java diff --git a/checker/src/org/checkerframework/checker/units/qual/UnknownUnits.java b/checker/src/main/java/org/checkerframework/checker/units/qual/UnknownUnits.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/UnknownUnits.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/UnknownUnits.java diff --git a/checker/src/org/checkerframework/checker/units/qual/cd.java b/checker/src/main/java/org/checkerframework/checker/units/qual/cd.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/cd.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/cd.java diff --git a/checker/src/org/checkerframework/checker/units/qual/degrees.java b/checker/src/main/java/org/checkerframework/checker/units/qual/degrees.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/degrees.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/degrees.java diff --git a/checker/src/org/checkerframework/checker/units/qual/g.java b/checker/src/main/java/org/checkerframework/checker/units/qual/g.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/g.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/g.java diff --git a/checker/src/org/checkerframework/checker/units/qual/h.java b/checker/src/main/java/org/checkerframework/checker/units/qual/h.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/h.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/h.java diff --git a/checker/src/org/checkerframework/checker/units/qual/kg.java b/checker/src/main/java/org/checkerframework/checker/units/qual/kg.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/kg.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/kg.java diff --git a/checker/src/org/checkerframework/checker/units/qual/km.java b/checker/src/main/java/org/checkerframework/checker/units/qual/km.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/km.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/km.java diff --git a/checker/src/org/checkerframework/checker/units/qual/km2.java b/checker/src/main/java/org/checkerframework/checker/units/qual/km2.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/km2.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/km2.java diff --git a/checker/src/org/checkerframework/checker/units/qual/kmPERh.java b/checker/src/main/java/org/checkerframework/checker/units/qual/kmPERh.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/kmPERh.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/kmPERh.java diff --git a/checker/src/org/checkerframework/checker/units/qual/m.java b/checker/src/main/java/org/checkerframework/checker/units/qual/m.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/m.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/m.java diff --git a/checker/src/org/checkerframework/checker/units/qual/m2.java b/checker/src/main/java/org/checkerframework/checker/units/qual/m2.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/m2.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/m2.java diff --git a/checker/src/org/checkerframework/checker/units/qual/mPERs.java b/checker/src/main/java/org/checkerframework/checker/units/qual/mPERs.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/mPERs.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/mPERs.java diff --git a/checker/src/org/checkerframework/checker/units/qual/mPERs2.java b/checker/src/main/java/org/checkerframework/checker/units/qual/mPERs2.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/mPERs2.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/mPERs2.java diff --git a/checker/src/org/checkerframework/checker/units/qual/min.java b/checker/src/main/java/org/checkerframework/checker/units/qual/min.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/min.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/min.java diff --git a/checker/src/org/checkerframework/checker/units/qual/mm.java b/checker/src/main/java/org/checkerframework/checker/units/qual/mm.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/mm.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/mm.java diff --git a/checker/src/org/checkerframework/checker/units/qual/mm2.java b/checker/src/main/java/org/checkerframework/checker/units/qual/mm2.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/mm2.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/mm2.java diff --git a/checker/src/org/checkerframework/checker/units/qual/mol.java b/checker/src/main/java/org/checkerframework/checker/units/qual/mol.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/mol.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/mol.java diff --git a/checker/src/org/checkerframework/checker/units/qual/radians.java b/checker/src/main/java/org/checkerframework/checker/units/qual/radians.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/radians.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/radians.java diff --git a/checker/src/org/checkerframework/checker/units/qual/s.java b/checker/src/main/java/org/checkerframework/checker/units/qual/s.java similarity index 100% rename from checker/src/org/checkerframework/checker/units/qual/s.java rename to checker/src/main/java/org/checkerframework/checker/units/qual/s.java diff --git a/checker/tests/src/testlib/NestedAggregateChecker.java b/checker/src/test/java/testlib/NestedAggregateChecker.java similarity index 100% rename from checker/tests/src/testlib/NestedAggregateChecker.java rename to checker/src/test/java/testlib/NestedAggregateChecker.java diff --git a/checker/src/test/java/testlib/lib b/checker/src/test/java/testlib/lib new file mode 120000 index 00000000000..382ebb07e99 --- /dev/null +++ b/checker/src/test/java/testlib/lib @@ -0,0 +1 @@ +../../../../../framework/src/test/java/testlib/lib \ No newline at end of file diff --git a/checker/tests/src/testlib/lubglb/FormatterLubGlbChecker.java b/checker/src/test/java/testlib/lubglb/FormatterLubGlbChecker.java similarity index 100% rename from checker/tests/src/testlib/lubglb/FormatterLubGlbChecker.java rename to checker/src/test/java/testlib/lubglb/FormatterLubGlbChecker.java diff --git a/checker/tests/src/testlib/lubglb/I18nFormatterLubGlbChecker.java b/checker/src/test/java/testlib/lubglb/I18nFormatterLubGlbChecker.java similarity index 100% rename from checker/tests/src/testlib/lubglb/I18nFormatterLubGlbChecker.java rename to checker/src/test/java/testlib/lubglb/I18nFormatterLubGlbChecker.java diff --git a/checker/tests/src/tests/CompilerMessagesTest.java b/checker/src/test/java/tests/CompilerMessagesTest.java similarity index 100% rename from checker/tests/src/tests/CompilerMessagesTest.java rename to checker/src/test/java/tests/CompilerMessagesTest.java diff --git a/checker/tests/src/tests/FenumSwingTest.java b/checker/src/test/java/tests/FenumSwingTest.java similarity index 100% rename from checker/tests/src/tests/FenumSwingTest.java rename to checker/src/test/java/tests/FenumSwingTest.java diff --git a/checker/tests/src/tests/FenumTest.java b/checker/src/test/java/tests/FenumTest.java similarity index 100% rename from checker/tests/src/tests/FenumTest.java rename to checker/src/test/java/tests/FenumTest.java diff --git a/checker/tests/src/tests/FormatterLubGlbCheckerTest.java b/checker/src/test/java/tests/FormatterLubGlbCheckerTest.java similarity index 100% rename from checker/tests/src/tests/FormatterLubGlbCheckerTest.java rename to checker/src/test/java/tests/FormatterLubGlbCheckerTest.java diff --git a/checker/tests/src/tests/FormatterTest.java b/checker/src/test/java/tests/FormatterTest.java similarity index 100% rename from checker/tests/src/tests/FormatterTest.java rename to checker/src/test/java/tests/FormatterTest.java diff --git a/checker/tests/src/tests/FormatterUncheckedDefaultsTest.java b/checker/src/test/java/tests/FormatterUncheckedDefaultsTest.java similarity index 100% rename from checker/tests/src/tests/FormatterUncheckedDefaultsTest.java rename to checker/src/test/java/tests/FormatterUncheckedDefaultsTest.java diff --git a/checker/tests/src/tests/GuiEffectTest.java b/checker/src/test/java/tests/GuiEffectTest.java similarity index 100% rename from checker/tests/src/tests/GuiEffectTest.java rename to checker/src/test/java/tests/GuiEffectTest.java diff --git a/checker/tests/src/tests/I18nFormatterLubGlbCheckerTest.java b/checker/src/test/java/tests/I18nFormatterLubGlbCheckerTest.java similarity index 100% rename from checker/tests/src/tests/I18nFormatterLubGlbCheckerTest.java rename to checker/src/test/java/tests/I18nFormatterLubGlbCheckerTest.java diff --git a/checker/tests/src/tests/I18nFormatterTest.java b/checker/src/test/java/tests/I18nFormatterTest.java similarity index 100% rename from checker/tests/src/tests/I18nFormatterTest.java rename to checker/src/test/java/tests/I18nFormatterTest.java diff --git a/checker/tests/src/tests/I18nFormatterUncheckedDefaultsTest.java b/checker/src/test/java/tests/I18nFormatterUncheckedDefaultsTest.java similarity index 100% rename from checker/tests/src/tests/I18nFormatterUncheckedDefaultsTest.java rename to checker/src/test/java/tests/I18nFormatterUncheckedDefaultsTest.java diff --git a/checker/tests/src/tests/I18nFormatterUnitTest.java b/checker/src/test/java/tests/I18nFormatterUnitTest.java similarity index 100% rename from checker/tests/src/tests/I18nFormatterUnitTest.java rename to checker/src/test/java/tests/I18nFormatterUnitTest.java diff --git a/checker/tests/src/tests/I18nTest.java b/checker/src/test/java/tests/I18nTest.java similarity index 100% rename from checker/tests/src/tests/I18nTest.java rename to checker/src/test/java/tests/I18nTest.java diff --git a/checker/tests/src/tests/I18nUncheckedDefaultsTest.java b/checker/src/test/java/tests/I18nUncheckedDefaultsTest.java similarity index 100% rename from checker/tests/src/tests/I18nUncheckedDefaultsTest.java rename to checker/src/test/java/tests/I18nUncheckedDefaultsTest.java diff --git a/checker/tests/src/tests/IndexTest.java b/checker/src/test/java/tests/IndexTest.java similarity index 100% rename from checker/tests/src/tests/IndexTest.java rename to checker/src/test/java/tests/IndexTest.java diff --git a/checker/tests/src/tests/InterningTest.java b/checker/src/test/java/tests/InterningTest.java similarity index 100% rename from checker/tests/src/tests/InterningTest.java rename to checker/src/test/java/tests/InterningTest.java diff --git a/checker/tests/src/tests/LockSafeDefaultsTest.java b/checker/src/test/java/tests/LockSafeDefaultsTest.java similarity index 100% rename from checker/tests/src/tests/LockSafeDefaultsTest.java rename to checker/src/test/java/tests/LockSafeDefaultsTest.java diff --git a/checker/tests/src/tests/LockTest.java b/checker/src/test/java/tests/LockTest.java similarity index 100% rename from checker/tests/src/tests/LockTest.java rename to checker/src/test/java/tests/LockTest.java diff --git a/checker/tests/src/tests/NestedAggregateCheckerTest.java b/checker/src/test/java/tests/NestedAggregateCheckerTest.java similarity index 100% rename from checker/tests/src/tests/NestedAggregateCheckerTest.java rename to checker/src/test/java/tests/NestedAggregateCheckerTest.java diff --git a/checker/tests/src/tests/NullnessAssumeAssertionsAreDisabled.java b/checker/src/test/java/tests/NullnessAssumeAssertionsAreDisabled.java similarity index 100% rename from checker/tests/src/tests/NullnessAssumeAssertionsAreDisabled.java rename to checker/src/test/java/tests/NullnessAssumeAssertionsAreDisabled.java diff --git a/checker/tests/src/tests/NullnessCheckCastElementTypeTest.java b/checker/src/test/java/tests/NullnessCheckCastElementTypeTest.java similarity index 100% rename from checker/tests/src/tests/NullnessCheckCastElementTypeTest.java rename to checker/src/test/java/tests/NullnessCheckCastElementTypeTest.java diff --git a/checker/tests/src/tests/NullnessConcurrentTest.java b/checker/src/test/java/tests/NullnessConcurrentTest.java similarity index 100% rename from checker/tests/src/tests/NullnessConcurrentTest.java rename to checker/src/test/java/tests/NullnessConcurrentTest.java diff --git a/checker/tests/src/tests/NullnessFbcJavacErrorsTest.java b/checker/src/test/java/tests/NullnessFbcJavacErrorsTest.java similarity index 100% rename from checker/tests/src/tests/NullnessFbcJavacErrorsTest.java rename to checker/src/test/java/tests/NullnessFbcJavacErrorsTest.java diff --git a/checker/tests/src/tests/NullnessFbcTest.java b/checker/src/test/java/tests/NullnessFbcTest.java similarity index 100% rename from checker/tests/src/tests/NullnessFbcTest.java rename to checker/src/test/java/tests/NullnessFbcTest.java diff --git a/checker/tests/src/tests/NullnessFbcTestWithAsserts.java b/checker/src/test/java/tests/NullnessFbcTestWithAsserts.java similarity index 100% rename from checker/tests/src/tests/NullnessFbcTestWithAsserts.java rename to checker/src/test/java/tests/NullnessFbcTestWithAsserts.java diff --git a/checker/tests/src/tests/NullnessGenericWildcardTest.java b/checker/src/test/java/tests/NullnessGenericWildcardTest.java similarity index 100% rename from checker/tests/src/tests/NullnessGenericWildcardTest.java rename to checker/src/test/java/tests/NullnessGenericWildcardTest.java diff --git a/checker/tests/src/tests/NullnessInvariantArraysTest.java b/checker/src/test/java/tests/NullnessInvariantArraysTest.java similarity index 100% rename from checker/tests/src/tests/NullnessInvariantArraysTest.java rename to checker/src/test/java/tests/NullnessInvariantArraysTest.java diff --git a/checker/tests/src/tests/NullnessRawnessTest.java b/checker/src/test/java/tests/NullnessRawnessTest.java similarity index 100% rename from checker/tests/src/tests/NullnessRawnessTest.java rename to checker/src/test/java/tests/NullnessRawnessTest.java diff --git a/checker/tests/src/tests/NullnessRawnessTestWithAsserts.java b/checker/src/test/java/tests/NullnessRawnessTestWithAsserts.java similarity index 100% rename from checker/tests/src/tests/NullnessRawnessTestWithAsserts.java rename to checker/src/test/java/tests/NullnessRawnessTestWithAsserts.java diff --git a/checker/tests/src/tests/NullnessReflectionTest.java b/checker/src/test/java/tests/NullnessReflectionTest.java similarity index 100% rename from checker/tests/src/tests/NullnessReflectionTest.java rename to checker/src/test/java/tests/NullnessReflectionTest.java diff --git a/checker/tests/src/tests/NullnessSafeDefaultsBytecodeTest.java b/checker/src/test/java/tests/NullnessSafeDefaultsBytecodeTest.java similarity index 100% rename from checker/tests/src/tests/NullnessSafeDefaultsBytecodeTest.java rename to checker/src/test/java/tests/NullnessSafeDefaultsBytecodeTest.java diff --git a/checker/tests/src/tests/NullnessSafeDefaultsSourceCodeTest.java b/checker/src/test/java/tests/NullnessSafeDefaultsSourceCodeTest.java similarity index 100% rename from checker/tests/src/tests/NullnessSafeDefaultsSourceCodeTest.java rename to checker/src/test/java/tests/NullnessSafeDefaultsSourceCodeTest.java diff --git a/checker/tests/src/tests/NullnessSkipDefsTest.java b/checker/src/test/java/tests/NullnessSkipDefsTest.java similarity index 100% rename from checker/tests/src/tests/NullnessSkipDefsTest.java rename to checker/src/test/java/tests/NullnessSkipDefsTest.java diff --git a/checker/tests/src/tests/NullnessSkipUsesTest.java b/checker/src/test/java/tests/NullnessSkipUsesTest.java similarity index 100% rename from checker/tests/src/tests/NullnessSkipUsesTest.java rename to checker/src/test/java/tests/NullnessSkipUsesTest.java diff --git a/checker/tests/src/tests/NullnessStubfileTest.java b/checker/src/test/java/tests/NullnessStubfileTest.java similarity index 100% rename from checker/tests/src/tests/NullnessStubfileTest.java rename to checker/src/test/java/tests/NullnessStubfileTest.java diff --git a/checker/tests/src/tests/NullnessTempTest.java b/checker/src/test/java/tests/NullnessTempTest.java similarity index 100% rename from checker/tests/src/tests/NullnessTempTest.java rename to checker/src/test/java/tests/NullnessTempTest.java diff --git a/checker/tests/src/tests/OptionalTest.java b/checker/src/test/java/tests/OptionalTest.java similarity index 100% rename from checker/tests/src/tests/OptionalTest.java rename to checker/src/test/java/tests/OptionalTest.java diff --git a/checker/tests/src/tests/README b/checker/src/test/java/tests/README similarity index 100% rename from checker/tests/src/tests/README rename to checker/src/test/java/tests/README diff --git a/checker/tests/src/tests/RegexTest.java b/checker/src/test/java/tests/RegexTest.java similarity index 100% rename from checker/tests/src/tests/RegexTest.java rename to checker/src/test/java/tests/RegexTest.java diff --git a/checker/tests/src/tests/SignatureTest.java b/checker/src/test/java/tests/SignatureTest.java similarity index 100% rename from checker/tests/src/tests/SignatureTest.java rename to checker/src/test/java/tests/SignatureTest.java diff --git a/checker/tests/src/tests/SignednessTest.java b/checker/src/test/java/tests/SignednessTest.java similarity index 100% rename from checker/tests/src/tests/SignednessTest.java rename to checker/src/test/java/tests/SignednessTest.java diff --git a/checker/tests/src/tests/SignednessUncheckedDefaultsTest.java b/checker/src/test/java/tests/SignednessUncheckedDefaultsTest.java similarity index 100% rename from checker/tests/src/tests/SignednessUncheckedDefaultsTest.java rename to checker/src/test/java/tests/SignednessUncheckedDefaultsTest.java diff --git a/checker/tests/src/tests/StubparserTests.java b/checker/src/test/java/tests/StubparserTests.java similarity index 100% rename from checker/tests/src/tests/StubparserTests.java rename to checker/src/test/java/tests/StubparserTests.java diff --git a/checker/tests/src/tests/TaintingTest.java b/checker/src/test/java/tests/TaintingTest.java similarity index 100% rename from checker/tests/src/tests/TaintingTest.java rename to checker/src/test/java/tests/TaintingTest.java diff --git a/checker/tests/src/tests/UnitsTest.java b/checker/src/test/java/tests/UnitsTest.java similarity index 100% rename from checker/tests/src/tests/UnitsTest.java rename to checker/src/test/java/tests/UnitsTest.java diff --git a/checker/tests/src/tests/ValueIndexInteractionTest.java b/checker/src/test/java/tests/ValueIndexInteractionTest.java similarity index 100% rename from checker/tests/src/tests/ValueIndexInteractionTest.java rename to checker/src/test/java/tests/ValueIndexInteractionTest.java diff --git a/checker/tests/src/testannotations/android/annotation/NonNull.java b/checker/src/testannotations/java/android/annotation/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/android/annotation/NonNull.java rename to checker/src/testannotations/java/android/annotation/NonNull.java diff --git a/checker/tests/src/testannotations/android/annotation/Nullable.java b/checker/src/testannotations/java/android/annotation/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/android/annotation/Nullable.java rename to checker/src/testannotations/java/android/annotation/Nullable.java diff --git a/checker/tests/src/testannotations/android/support/annotation/NonNull.java b/checker/src/testannotations/java/android/support/annotation/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/android/support/annotation/NonNull.java rename to checker/src/testannotations/java/android/support/annotation/NonNull.java diff --git a/checker/tests/src/testannotations/android/support/annotation/Nullable.java b/checker/src/testannotations/java/android/support/annotation/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/android/support/annotation/Nullable.java rename to checker/src/testannotations/java/android/support/annotation/Nullable.java diff --git a/checker/tests/src/testannotations/com/sun/istack/internal/Interned.java b/checker/src/testannotations/java/com/sun/istack/internal/Interned.java similarity index 100% rename from checker/tests/src/testannotations/com/sun/istack/internal/Interned.java rename to checker/src/testannotations/java/com/sun/istack/internal/Interned.java diff --git a/checker/tests/src/testannotations/com/sun/istack/internal/NotNull.java b/checker/src/testannotations/java/com/sun/istack/internal/NotNull.java similarity index 100% rename from checker/tests/src/testannotations/com/sun/istack/internal/NotNull.java rename to checker/src/testannotations/java/com/sun/istack/internal/NotNull.java diff --git a/checker/tests/src/testannotations/com/sun/istack/internal/Nullable.java b/checker/src/testannotations/java/com/sun/istack/internal/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/com/sun/istack/internal/Nullable.java rename to checker/src/testannotations/java/com/sun/istack/internal/Nullable.java diff --git a/checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/CheckForNull.java b/checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/CheckForNull.java similarity index 100% rename from checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/CheckForNull.java rename to checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/CheckForNull.java diff --git a/checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/NonNull.java b/checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/NonNull.java rename to checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/NonNull.java diff --git a/checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/Nullable.java b/checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/Nullable.java rename to checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/Nullable.java diff --git a/checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java b/checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/PossiblyNull.java similarity index 100% rename from checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/PossiblyNull.java rename to checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/PossiblyNull.java diff --git a/checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java b/checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/UnknownNullness.java similarity index 100% rename from checker/tests/src/testannotations/edu/umd/cs/findbugs/annotations/UnknownNullness.java rename to checker/src/testannotations/java/edu/umd/cs/findbugs/annotations/UnknownNullness.java diff --git a/checker/tests/src/testannotations/javax/annotation/CheckForNull.java b/checker/src/testannotations/java/javax/annotation/CheckForNull.java similarity index 100% rename from checker/tests/src/testannotations/javax/annotation/CheckForNull.java rename to checker/src/testannotations/java/javax/annotation/CheckForNull.java diff --git a/checker/tests/src/testannotations/javax/annotation/Nonnull.java b/checker/src/testannotations/java/javax/annotation/Nonnull.java similarity index 100% rename from checker/tests/src/testannotations/javax/annotation/Nonnull.java rename to checker/src/testannotations/java/javax/annotation/Nonnull.java diff --git a/checker/tests/src/testannotations/javax/annotation/Nullable.java b/checker/src/testannotations/java/javax/annotation/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/javax/annotation/Nullable.java rename to checker/src/testannotations/java/javax/annotation/Nullable.java diff --git a/checker/tests/src/testannotations/javax/annotation/concurrent/GuardedBy.java b/checker/src/testannotations/java/javax/annotation/concurrent/GuardedBy.java similarity index 100% rename from checker/tests/src/testannotations/javax/annotation/concurrent/GuardedBy.java rename to checker/src/testannotations/java/javax/annotation/concurrent/GuardedBy.java diff --git a/checker/tests/src/testannotations/javax/annotation/meta/When.java b/checker/src/testannotations/java/javax/annotation/meta/When.java similarity index 100% rename from checker/tests/src/testannotations/javax/annotation/meta/When.java rename to checker/src/testannotations/java/javax/annotation/meta/When.java diff --git a/checker/tests/src/testannotations/javax/validation/constraints/NotNull.java b/checker/src/testannotations/java/javax/validation/constraints/NotNull.java similarity index 100% rename from checker/tests/src/testannotations/javax/validation/constraints/NotNull.java rename to checker/src/testannotations/java/javax/validation/constraints/NotNull.java diff --git a/checker/tests/src/testannotations/lombok/NonNull.java b/checker/src/testannotations/java/lombok/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/lombok/NonNull.java rename to checker/src/testannotations/java/lombok/NonNull.java diff --git a/checker/tests/src/testannotations/net/jcip/annotations/GuardedBy.java b/checker/src/testannotations/java/net/jcip/annotations/GuardedBy.java similarity index 100% rename from checker/tests/src/testannotations/net/jcip/annotations/GuardedBy.java rename to checker/src/testannotations/java/net/jcip/annotations/GuardedBy.java diff --git a/checker/tests/src/testannotations/org/eclipse/jdt/annotation/NonNull.java b/checker/src/testannotations/java/org/eclipse/jdt/annotation/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/org/eclipse/jdt/annotation/NonNull.java rename to checker/src/testannotations/java/org/eclipse/jdt/annotation/NonNull.java diff --git a/checker/tests/src/testannotations/org/eclipse/jdt/annotation/Nullable.java b/checker/src/testannotations/java/org/eclipse/jdt/annotation/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/org/eclipse/jdt/annotation/Nullable.java rename to checker/src/testannotations/java/org/eclipse/jdt/annotation/Nullable.java diff --git a/checker/tests/src/testannotations/org/eclipse/jgit/annotations/NonNull.java b/checker/src/testannotations/java/org/eclipse/jgit/annotations/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/org/eclipse/jgit/annotations/NonNull.java rename to checker/src/testannotations/java/org/eclipse/jgit/annotations/NonNull.java diff --git a/checker/tests/src/testannotations/org/eclipse/jgit/annotations/Nullable.java b/checker/src/testannotations/java/org/eclipse/jgit/annotations/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/org/eclipse/jgit/annotations/Nullable.java rename to checker/src/testannotations/java/org/eclipse/jgit/annotations/Nullable.java diff --git a/checker/tests/src/testannotations/org/jetbrains/annotations/NotNull.java b/checker/src/testannotations/java/org/jetbrains/annotations/NotNull.java similarity index 100% rename from checker/tests/src/testannotations/org/jetbrains/annotations/NotNull.java rename to checker/src/testannotations/java/org/jetbrains/annotations/NotNull.java diff --git a/checker/tests/src/testannotations/org/jetbrains/annotations/Nullable.java b/checker/src/testannotations/java/org/jetbrains/annotations/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/org/jetbrains/annotations/Nullable.java rename to checker/src/testannotations/java/org/jetbrains/annotations/Nullable.java diff --git a/checker/tests/src/testannotations/org/jmlspecs/annotation/NonNull.java b/checker/src/testannotations/java/org/jmlspecs/annotation/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/org/jmlspecs/annotation/NonNull.java rename to checker/src/testannotations/java/org/jmlspecs/annotation/NonNull.java diff --git a/checker/tests/src/testannotations/org/jmlspecs/annotation/Nullable.java b/checker/src/testannotations/java/org/jmlspecs/annotation/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/org/jmlspecs/annotation/Nullable.java rename to checker/src/testannotations/java/org/jmlspecs/annotation/Nullable.java diff --git a/checker/tests/src/testannotations/org/netbeans/api/annotations/common/CheckForNull.java b/checker/src/testannotations/java/org/netbeans/api/annotations/common/CheckForNull.java similarity index 100% rename from checker/tests/src/testannotations/org/netbeans/api/annotations/common/CheckForNull.java rename to checker/src/testannotations/java/org/netbeans/api/annotations/common/CheckForNull.java diff --git a/checker/tests/src/testannotations/org/netbeans/api/annotations/common/NonNull.java b/checker/src/testannotations/java/org/netbeans/api/annotations/common/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/org/netbeans/api/annotations/common/NonNull.java rename to checker/src/testannotations/java/org/netbeans/api/annotations/common/NonNull.java diff --git a/checker/tests/src/testannotations/org/netbeans/api/annotations/common/NullAllowed.java b/checker/src/testannotations/java/org/netbeans/api/annotations/common/NullAllowed.java similarity index 100% rename from checker/tests/src/testannotations/org/netbeans/api/annotations/common/NullAllowed.java rename to checker/src/testannotations/java/org/netbeans/api/annotations/common/NullAllowed.java diff --git a/checker/tests/src/testannotations/org/netbeans/api/annotations/common/NullUnknown.java b/checker/src/testannotations/java/org/netbeans/api/annotations/common/NullUnknown.java similarity index 100% rename from checker/tests/src/testannotations/org/netbeans/api/annotations/common/NullUnknown.java rename to checker/src/testannotations/java/org/netbeans/api/annotations/common/NullUnknown.java diff --git a/checker/tests/src/testannotations/org/springframework/lang/NonNull.java b/checker/src/testannotations/java/org/springframework/lang/NonNull.java similarity index 100% rename from checker/tests/src/testannotations/org/springframework/lang/NonNull.java rename to checker/src/testannotations/java/org/springframework/lang/NonNull.java diff --git a/checker/tests/src/testannotations/org/springframework/lang/Nullable.java b/checker/src/testannotations/java/org/springframework/lang/Nullable.java similarity index 100% rename from checker/tests/src/testannotations/org/springframework/lang/Nullable.java rename to checker/src/testannotations/java/org/springframework/lang/Nullable.java diff --git a/checker/tests/README b/checker/tests/README index 8e6b266561b..8cc98cc0e90 100644 --- a/checker/tests/README +++ b/checker/tests/README @@ -55,7 +55,7 @@ whose name usually corresponds to the checker name, such as checker-framework/checker/tests/nullness/ . Unless the README file in the test directory specifies otherwise, then the Java file must 1. Not issue any javac errors. -2. Not declare a class with the same (fully qualfied) name as any other class in +2. Not declare a class with the same (fully qualified) name as any other class in the test directory. 3. Not declare a class with the same (simple) name as any commonly used Java library class such as List. @@ -161,7 +161,7 @@ Writing tests for a new checker or with different command-line arguments To create tests for a new checker, mimic some existing checker's tests: * create a top-level test directory, such as checker-framework/checker/tests/regex for the test cases - * create a top-level JUnit test in checker-framework/checker/tests/src/tests, + * create a top-level JUnit test in checker-framework/checker/src/test/tests, such as: RegexTest.java It is a subclass of CheckerFrameworkPerDirectoryTest, and its list of checker options must include "-Anomsgtext". (See the API documentation for diff --git a/checker/tests/src/testlib/lib b/checker/tests/src/testlib/lib deleted file mode 120000 index 305ea7009a3..00000000000 --- a/checker/tests/src/testlib/lib +++ /dev/null @@ -1 +0,0 @@ -../../../../framework/tests/src/testlib/lib \ No newline at end of file diff --git a/dataflow/.classpath b/dataflow/.classpath index 24e3ed20a3b..baffebda153 100644 --- a/dataflow/.classpath +++ b/dataflow/.classpath @@ -1,9 +1,32 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dataflow/.project b/dataflow/.project index 94af65b32ab..db28901e02b 100644 --- a/dataflow/.project +++ b/dataflow/.project @@ -10,8 +10,14 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature diff --git a/dataflow/build.gradle b/dataflow/build.gradle index e10aa31985a..a37d69f5c49 100644 --- a/dataflow/build.gradle +++ b/dataflow/build.gradle @@ -2,11 +2,3 @@ dependencies { compile project(':javacutil') compile project(':checker-qual') } - -sourceSets { - main { - java { - srcDirs = ['src'] - } - } -} diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/AbstractValue.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/AbstractValue.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/AbstractValue.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/AbstractValue.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/Analysis.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/Analysis.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/Analysis.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/Analysis.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/AnalysisResult.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/AnalysisResult.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/AnalysisResult.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/AnalysisResult.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/ConditionalTransferResult.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/ConditionalTransferResult.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/ConditionalTransferResult.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/ConditionalTransferResult.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/FlowExpressions.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/FlowExpressions.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/FlowExpressions.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/FlowExpressions.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/RegularTransferResult.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/RegularTransferResult.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/RegularTransferResult.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/RegularTransferResult.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/Store.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/Store.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/Store.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/Store.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/TransferFunction.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferFunction.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/TransferFunction.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferFunction.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/TransferInput.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferInput.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/TransferInput.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferInput.java diff --git a/dataflow/src/org/checkerframework/dataflow/analysis/TransferResult.java b/dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferResult.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/analysis/TransferResult.java rename to dataflow/src/main/java/org/checkerframework/dataflow/analysis/TransferResult.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/CFGBuilder.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGBuilder.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/CFGBuilder.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGBuilder.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/CFGVisualizer.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGVisualizer.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/CFGVisualizer.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGVisualizer.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/ControlFlowGraph.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/ControlFlowGraph.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/ControlFlowGraph.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/ControlFlowGraph.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/DOTCFGVisualizer.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/DOTCFGVisualizer.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/DOTCFGVisualizer.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/DOTCFGVisualizer.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/JavaSource2CFGDOT.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/JavaSource2CFGDOT.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/JavaSource2CFGDOT.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/JavaSource2CFGDOT.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/UnderlyingAST.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/UnderlyingAST.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/UnderlyingAST.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/UnderlyingAST.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/Block.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/Block.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/Block.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/Block.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/BlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/BlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/BlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/BlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/ConditionalBlock.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ConditionalBlock.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/ConditionalBlock.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ConditionalBlock.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/ConditionalBlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ConditionalBlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/ConditionalBlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ConditionalBlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/ExceptionBlock.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ExceptionBlock.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/ExceptionBlock.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ExceptionBlock.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/ExceptionBlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ExceptionBlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/ExceptionBlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/ExceptionBlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/RegularBlock.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/RegularBlock.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/RegularBlock.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/RegularBlock.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/RegularBlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/RegularBlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/RegularBlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/RegularBlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlock.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlock.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlock.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlock.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SingleSuccessorBlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/SpecialBlock.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SpecialBlock.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/SpecialBlock.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SpecialBlock.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/block/SpecialBlockImpl.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SpecialBlockImpl.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/block/SpecialBlockImpl.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/block/SpecialBlockImpl.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/AbstractNodeVisitor.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AbstractNodeVisitor.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/AbstractNodeVisitor.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AbstractNodeVisitor.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayAccessNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayAccessNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayAccessNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayAccessNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayCreationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayCreationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayCreationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayCreationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayTypeNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayTypeNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ArrayTypeNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ArrayTypeNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/AssertionErrorNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssertionErrorNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/AssertionErrorNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssertionErrorNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/AssignmentContext.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssignmentContext.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/AssignmentContext.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssignmentContext.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/AssignmentNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssignmentNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/AssignmentNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/AssignmentNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BinaryOperationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BinaryOperationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BinaryOperationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BinaryOperationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseAndNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseAndNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseAndNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseAndNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseComplementNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseComplementNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseComplementNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseComplementNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseOrNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseOrNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseOrNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseOrNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseXorNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseXorNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BitwiseXorNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BitwiseXorNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/BooleanLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BooleanLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/BooleanLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/BooleanLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/CaseNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/CaseNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/CaseNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/CaseNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/CharacterLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/CharacterLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/CharacterLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/CharacterLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ClassNameNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ClassNameNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ClassNameNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ClassNameNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalAndNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalAndNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalAndNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalAndNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalNotNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalNotNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalNotNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalNotNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalOrNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalOrNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ConditionalOrNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ConditionalOrNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/DoubleLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/DoubleLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/DoubleLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/DoubleLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/EqualToNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/EqualToNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/EqualToNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/EqualToNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ExplicitThisLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ExplicitThisLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ExplicitThisLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ExplicitThisLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/FieldAccessNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FieldAccessNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/FieldAccessNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FieldAccessNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/FloatLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/FloatLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/FloatingDivisionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatingDivisionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/FloatingDivisionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatingDivisionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/FloatingRemainderNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatingRemainderNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/FloatingRemainderNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FloatingRemainderNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/FunctionalInterfaceNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FunctionalInterfaceNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/FunctionalInterfaceNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/FunctionalInterfaceNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/GreaterThanNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/GreaterThanNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/GreaterThanNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/GreaterThanNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/GreaterThanOrEqualNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/GreaterThanOrEqualNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/GreaterThanOrEqualNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/GreaterThanOrEqualNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ImplicitThisLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ImplicitThisLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ImplicitThisLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ImplicitThisLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/InstanceOfNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/InstanceOfNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/InstanceOfNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/InstanceOfNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerDivisionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerDivisionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerDivisionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerDivisionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerRemainderNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerRemainderNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/IntegerRemainderNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/IntegerRemainderNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LambdaResultExpressionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LambdaResultExpressionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LambdaResultExpressionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LambdaResultExpressionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LeftShiftNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LeftShiftNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LeftShiftNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LeftShiftNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LessThanNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LessThanNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LessThanNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LessThanNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LessThanOrEqualNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LessThanOrEqualNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LessThanOrEqualNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LessThanOrEqualNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LocalVariableNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LocalVariableNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LocalVariableNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LocalVariableNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/LongLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LongLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/LongLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/LongLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/MarkerNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MarkerNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/MarkerNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MarkerNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/MethodAccessNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodAccessNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/MethodAccessNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodAccessNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/MethodInvocationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NarrowingConversionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NarrowingConversionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NarrowingConversionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NarrowingConversionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/Node.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/Node.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/Node.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/Node.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NodeVisitor.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NodeVisitor.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NodeVisitor.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NodeVisitor.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NotEqualNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NotEqualNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NotEqualNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NotEqualNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NullChkNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NullChkNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NullChkNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NullChkNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NullLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NullLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NullLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NullLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalAdditionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalAdditionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalAdditionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalAdditionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalMinusNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalMinusNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalMinusNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalMinusNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalMultiplicationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalMultiplicationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalMultiplicationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalMultiplicationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalPlusNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalPlusNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalPlusNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalPlusNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalSubtractionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalSubtractionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/NumericalSubtractionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/NumericalSubtractionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ObjectCreationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ObjectCreationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ObjectCreationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ObjectCreationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/PackageNameNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/PackageNameNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/PackageNameNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/PackageNameNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ParameterizedTypeNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ParameterizedTypeNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ParameterizedTypeNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ParameterizedTypeNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/PrimitiveTypeNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/PrimitiveTypeNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/PrimitiveTypeNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/PrimitiveTypeNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ReturnNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ReturnNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ReturnNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ReturnNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ShortLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ShortLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ShortLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ShortLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/SignedRightShiftNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SignedRightShiftNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/SignedRightShiftNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SignedRightShiftNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/StringConcatenateAssignmentNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConcatenateAssignmentNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/StringConcatenateAssignmentNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConcatenateAssignmentNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/StringConcatenateNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConcatenateNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/StringConcatenateNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConcatenateNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/StringConversionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConversionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/StringConversionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringConversionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/StringLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/StringLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/StringLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/SuperNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SuperNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/SuperNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SuperNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/SynchronizedNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SynchronizedNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/SynchronizedNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SynchronizedNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/TernaryExpressionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/TernaryExpressionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/TernaryExpressionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/TernaryExpressionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ThisLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ThisLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ThisLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ThisLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ThrowNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ThrowNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ThrowNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ThrowNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/TypeCastNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/TypeCastNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/TypeCastNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/TypeCastNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/UnaryOperationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/UnaryOperationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/UnaryOperationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/UnaryOperationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/UnsignedRightShiftNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/UnsignedRightShiftNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/UnsignedRightShiftNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/UnsignedRightShiftNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/ValueLiteralNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ValueLiteralNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/ValueLiteralNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/ValueLiteralNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/VariableDeclarationNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/VariableDeclarationNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/VariableDeclarationNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/VariableDeclarationNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/node/WideningConversionNode.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/WideningConversionNode.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/node/WideningConversionNode.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/WideningConversionNode.java diff --git a/dataflow/src/org/checkerframework/dataflow/cfg/playground/ConstantPropagationPlayground.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/playground/ConstantPropagationPlayground.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/cfg/playground/ConstantPropagationPlayground.java rename to dataflow/src/main/java/org/checkerframework/dataflow/cfg/playground/ConstantPropagationPlayground.java diff --git a/dataflow/src/org/checkerframework/dataflow/constantpropagation/Constant.java b/dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/Constant.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/constantpropagation/Constant.java rename to dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/Constant.java diff --git a/dataflow/src/org/checkerframework/dataflow/constantpropagation/ConstantPropagationStore.java b/dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/ConstantPropagationStore.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/constantpropagation/ConstantPropagationStore.java rename to dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/ConstantPropagationStore.java diff --git a/dataflow/src/org/checkerframework/dataflow/constantpropagation/ConstantPropagationTransfer.java b/dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/ConstantPropagationTransfer.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/constantpropagation/ConstantPropagationTransfer.java rename to dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/ConstantPropagationTransfer.java diff --git a/dataflow/src/org/checkerframework/dataflow/qual/Deterministic.java b/dataflow/src/main/java/org/checkerframework/dataflow/qual/Deterministic.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/qual/Deterministic.java rename to dataflow/src/main/java/org/checkerframework/dataflow/qual/Deterministic.java diff --git a/dataflow/src/org/checkerframework/dataflow/qual/Pure.java b/dataflow/src/main/java/org/checkerframework/dataflow/qual/Pure.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/qual/Pure.java rename to dataflow/src/main/java/org/checkerframework/dataflow/qual/Pure.java diff --git a/dataflow/src/org/checkerframework/dataflow/qual/SideEffectFree.java b/dataflow/src/main/java/org/checkerframework/dataflow/qual/SideEffectFree.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/qual/SideEffectFree.java rename to dataflow/src/main/java/org/checkerframework/dataflow/qual/SideEffectFree.java diff --git a/dataflow/src/org/checkerframework/dataflow/qual/TerminatesExecution.java b/dataflow/src/main/java/org/checkerframework/dataflow/qual/TerminatesExecution.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/qual/TerminatesExecution.java rename to dataflow/src/main/java/org/checkerframework/dataflow/qual/TerminatesExecution.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/AbstractMostlySingleton.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/AbstractMostlySingleton.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/AbstractMostlySingleton.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/AbstractMostlySingleton.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/HashCodeUtils.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/HashCodeUtils.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/HashCodeUtils.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/HashCodeUtils.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/IdentityMostlySingleton.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/IdentityMostlySingleton.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/IdentityMostlySingleton.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/IdentityMostlySingleton.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/MostlySingleton.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/MostlySingleton.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/MostlySingleton.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/MostlySingleton.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/NodeUtils.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/NodeUtils.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/NodeUtils.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/NodeUtils.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/PurityChecker.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/PurityChecker.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/PurityChecker.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/PurityChecker.java diff --git a/dataflow/src/org/checkerframework/dataflow/util/PurityUtils.java b/dataflow/src/main/java/org/checkerframework/dataflow/util/PurityUtils.java similarity index 100% rename from dataflow/src/org/checkerframework/dataflow/util/PurityUtils.java rename to dataflow/src/main/java/org/checkerframework/dataflow/util/PurityUtils.java diff --git a/framework/.classpath b/framework/.classpath index fa059fc07f6..6fb4c3569ea 100644 --- a/framework/.classpath +++ b/framework/.classpath @@ -1,18 +1,40 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/.project b/framework/.project index 88717f8a725..383c9ccb0a4 100644 --- a/framework/.project +++ b/framework/.project @@ -10,8 +10,14 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature diff --git a/framework/build.gradle b/framework/build.gradle index 3dacc600dcf..c58df8152f3 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -1,35 +1,32 @@ -dependencies { - compile project(':dataflow') - compile project(':javacutil') - compile files("${stubparserJar}") - compile files("${afuJar}") - compileOnly project(':checker-qual') - - testCompile group: 'junit', name: 'junit', version: '4.12' -} - sourceSets { main { - java { - srcDirs = ['src'] - exclude 'org/checkerframework/framework/test/**/*.java' - } resources { // Stub files, message.properties, etc. - srcDirs = ['src'] + srcDirs = ['src/main/java'] exclude '**/*.java' } } - + testannotations test { java { - srcDirs = ['tests/test-lubglb', 'tests/test-polyall', 'tests/src', 'src/org/checkerframework/framework/test'] // Tests that fail by design. exclude 'tests/SubtypingStringPatternsPartialTest.java' } } } +dependencies { + compile project(':dataflow') + compile project(':javacutil') + compile files("${stubparserJar}") + compile files("${afuJar}") + compileOnly project(':checker-qual') + + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile project(':util') + testCompile sourceSets.testannotations.output +} + shadowJar { description 'Creates the "fat" framework.jar in dist' destinationDir = file("${projectDir}/dist") diff --git a/framework/src/org/checkerframework/common/aliasing/AliasingAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/aliasing/AliasingAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/AliasingAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/aliasing/AliasingAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/aliasing/AliasingChecker.java b/framework/src/main/java/org/checkerframework/common/aliasing/AliasingChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/AliasingChecker.java rename to framework/src/main/java/org/checkerframework/common/aliasing/AliasingChecker.java diff --git a/framework/src/org/checkerframework/common/aliasing/AliasingTransfer.java b/framework/src/main/java/org/checkerframework/common/aliasing/AliasingTransfer.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/AliasingTransfer.java rename to framework/src/main/java/org/checkerframework/common/aliasing/AliasingTransfer.java diff --git a/framework/src/org/checkerframework/common/aliasing/AliasingVisitor.java b/framework/src/main/java/org/checkerframework/common/aliasing/AliasingVisitor.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/AliasingVisitor.java rename to framework/src/main/java/org/checkerframework/common/aliasing/AliasingVisitor.java diff --git a/framework/src/org/checkerframework/common/aliasing/android.astub b/framework/src/main/java/org/checkerframework/common/aliasing/android.astub similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/android.astub rename to framework/src/main/java/org/checkerframework/common/aliasing/android.astub diff --git a/framework/src/org/checkerframework/common/aliasing/messages.properties b/framework/src/main/java/org/checkerframework/common/aliasing/messages.properties similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/messages.properties rename to framework/src/main/java/org/checkerframework/common/aliasing/messages.properties diff --git a/framework/src/org/checkerframework/common/aliasing/qual/LeakedToResult.java b/framework/src/main/java/org/checkerframework/common/aliasing/qual/LeakedToResult.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/qual/LeakedToResult.java rename to framework/src/main/java/org/checkerframework/common/aliasing/qual/LeakedToResult.java diff --git a/framework/src/org/checkerframework/common/aliasing/qual/MaybeAliased.java b/framework/src/main/java/org/checkerframework/common/aliasing/qual/MaybeAliased.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/qual/MaybeAliased.java rename to framework/src/main/java/org/checkerframework/common/aliasing/qual/MaybeAliased.java diff --git a/framework/src/org/checkerframework/common/aliasing/qual/MaybeLeaked.java b/framework/src/main/java/org/checkerframework/common/aliasing/qual/MaybeLeaked.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/qual/MaybeLeaked.java rename to framework/src/main/java/org/checkerframework/common/aliasing/qual/MaybeLeaked.java diff --git a/framework/src/org/checkerframework/common/aliasing/qual/NonLeaked.java b/framework/src/main/java/org/checkerframework/common/aliasing/qual/NonLeaked.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/qual/NonLeaked.java rename to framework/src/main/java/org/checkerframework/common/aliasing/qual/NonLeaked.java diff --git a/framework/src/org/checkerframework/common/aliasing/qual/Unique.java b/framework/src/main/java/org/checkerframework/common/aliasing/qual/Unique.java similarity index 100% rename from framework/src/org/checkerframework/common/aliasing/qual/Unique.java rename to framework/src/main/java/org/checkerframework/common/aliasing/qual/Unique.java diff --git a/framework/src/org/checkerframework/common/basetype/BaseAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/BaseAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/basetype/BaseAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/basetype/BaseTypeChecker.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/BaseTypeChecker.java rename to framework/src/main/java/org/checkerframework/common/basetype/BaseTypeChecker.java diff --git a/framework/src/org/checkerframework/common/basetype/BaseTypeContext.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeContext.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/BaseTypeContext.java rename to framework/src/main/java/org/checkerframework/common/basetype/BaseTypeContext.java diff --git a/framework/src/org/checkerframework/common/basetype/BaseTypeValidator.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeValidator.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/BaseTypeValidator.java rename to framework/src/main/java/org/checkerframework/common/basetype/BaseTypeValidator.java diff --git a/framework/src/org/checkerframework/common/basetype/BaseTypeVisitor.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java similarity index 99% rename from framework/src/org/checkerframework/common/basetype/BaseTypeVisitor.java rename to framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java index 059cb007f3f..80710576cc1 100644 --- a/framework/src/org/checkerframework/common/basetype/BaseTypeVisitor.java +++ b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java @@ -103,13 +103,13 @@ import org.checkerframework.framework.util.FlowExpressionParseUtil; import org.checkerframework.framework.util.FlowExpressionParseUtil.FlowExpressionContext; import org.checkerframework.framework.util.FlowExpressionParseUtil.FlowExpressionParseException; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.framework.util.QualifierPolymorphism; import org.checkerframework.framework.util.dependenttypes.DependentTypesHelper; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ElementUtils; import org.checkerframework.javacutil.ErrorReporter; import org.checkerframework.javacutil.Pair; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; import org.checkerframework.javacutil.TypesUtils; diff --git a/framework/src/org/checkerframework/common/basetype/TypeValidator.java b/framework/src/main/java/org/checkerframework/common/basetype/TypeValidator.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/TypeValidator.java rename to framework/src/main/java/org/checkerframework/common/basetype/TypeValidator.java diff --git a/framework/src/org/checkerframework/common/basetype/messages.properties b/framework/src/main/java/org/checkerframework/common/basetype/messages.properties similarity index 100% rename from framework/src/org/checkerframework/common/basetype/messages.properties rename to framework/src/main/java/org/checkerframework/common/basetype/messages.properties diff --git a/framework/src/org/checkerframework/common/basetype/package-info.java b/framework/src/main/java/org/checkerframework/common/basetype/package-info.java similarity index 100% rename from framework/src/org/checkerframework/common/basetype/package-info.java rename to framework/src/main/java/org/checkerframework/common/basetype/package-info.java diff --git a/framework/src/org/checkerframework/common/reflection/ClassValAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/reflection/ClassValAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/ClassValAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/reflection/ClassValAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/reflection/ClassValChecker.java b/framework/src/main/java/org/checkerframework/common/reflection/ClassValChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/ClassValChecker.java rename to framework/src/main/java/org/checkerframework/common/reflection/ClassValChecker.java diff --git a/framework/src/org/checkerframework/common/reflection/ClassValVisitor.java b/framework/src/main/java/org/checkerframework/common/reflection/ClassValVisitor.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/ClassValVisitor.java rename to framework/src/main/java/org/checkerframework/common/reflection/ClassValVisitor.java diff --git a/framework/src/org/checkerframework/common/reflection/DefaultReflectionResolver.java b/framework/src/main/java/org/checkerframework/common/reflection/DefaultReflectionResolver.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/DefaultReflectionResolver.java rename to framework/src/main/java/org/checkerframework/common/reflection/DefaultReflectionResolver.java diff --git a/framework/src/org/checkerframework/common/reflection/MethodValAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/reflection/MethodValAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/MethodValAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/reflection/MethodValAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/reflection/MethodValChecker.java b/framework/src/main/java/org/checkerframework/common/reflection/MethodValChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/MethodValChecker.java rename to framework/src/main/java/org/checkerframework/common/reflection/MethodValChecker.java diff --git a/framework/src/org/checkerframework/common/reflection/MethodValVisitor.java b/framework/src/main/java/org/checkerframework/common/reflection/MethodValVisitor.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/MethodValVisitor.java rename to framework/src/main/java/org/checkerframework/common/reflection/MethodValVisitor.java diff --git a/framework/src/org/checkerframework/common/reflection/ReflectionResolver.java b/framework/src/main/java/org/checkerframework/common/reflection/ReflectionResolver.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/ReflectionResolver.java rename to framework/src/main/java/org/checkerframework/common/reflection/ReflectionResolver.java diff --git a/framework/src/org/checkerframework/common/reflection/messages.properties b/framework/src/main/java/org/checkerframework/common/reflection/messages.properties similarity index 100% rename from framework/src/org/checkerframework/common/reflection/messages.properties rename to framework/src/main/java/org/checkerframework/common/reflection/messages.properties diff --git a/framework/src/org/checkerframework/common/reflection/qual/ClassBound.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/ClassBound.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/ClassBound.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/ClassBound.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/ClassVal.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/ClassVal.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/ClassVal.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/ClassVal.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/ClassValBottom.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/ClassValBottom.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/ClassValBottom.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/ClassValBottom.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/ForName.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/ForName.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/ForName.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/ForName.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/GetClass.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/GetClass.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/GetClass.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/GetClass.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/GetConstructor.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/GetConstructor.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/GetConstructor.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/GetConstructor.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/GetMethod.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/GetMethod.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/GetMethod.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/GetMethod.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/Invoke.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/Invoke.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/Invoke.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/Invoke.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/MethodVal.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/MethodVal.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/MethodVal.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/MethodVal.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/MethodValBottom.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/MethodValBottom.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/MethodValBottom.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/MethodValBottom.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/NewInstance.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/NewInstance.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/NewInstance.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/NewInstance.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/UnknownClass.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/UnknownClass.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/UnknownClass.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/UnknownClass.java diff --git a/framework/src/org/checkerframework/common/reflection/qual/UnknownMethod.java b/framework/src/main/java/org/checkerframework/common/reflection/qual/UnknownMethod.java similarity index 100% rename from framework/src/org/checkerframework/common/reflection/qual/UnknownMethod.java rename to framework/src/main/java/org/checkerframework/common/reflection/qual/UnknownMethod.java diff --git a/framework/src/org/checkerframework/common/reflection/reflection.astub b/framework/src/main/java/org/checkerframework/common/reflection/reflection.astub similarity index 100% rename from framework/src/org/checkerframework/common/reflection/reflection.astub rename to framework/src/main/java/org/checkerframework/common/reflection/reflection.astub diff --git a/framework/src/org/checkerframework/common/subtyping/SubtypingAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/subtyping/SubtypingAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/subtyping/SubtypingAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/subtyping/SubtypingAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/subtyping/SubtypingAnnotationClassLoader.java b/framework/src/main/java/org/checkerframework/common/subtyping/SubtypingAnnotationClassLoader.java similarity index 100% rename from framework/src/org/checkerframework/common/subtyping/SubtypingAnnotationClassLoader.java rename to framework/src/main/java/org/checkerframework/common/subtyping/SubtypingAnnotationClassLoader.java diff --git a/framework/src/org/checkerframework/common/subtyping/SubtypingChecker.java b/framework/src/main/java/org/checkerframework/common/subtyping/SubtypingChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/subtyping/SubtypingChecker.java rename to framework/src/main/java/org/checkerframework/common/subtyping/SubtypingChecker.java diff --git a/framework/src/org/checkerframework/common/util/TypeVisualizer.java b/framework/src/main/java/org/checkerframework/common/util/TypeVisualizer.java similarity index 99% rename from framework/src/org/checkerframework/common/util/TypeVisualizer.java rename to framework/src/main/java/org/checkerframework/common/util/TypeVisualizer.java index e81457bc6d5..2a456bb3db3 100644 --- a/framework/src/org/checkerframework/common/util/TypeVisualizer.java +++ b/framework/src/main/java/org/checkerframework/common/util/TypeVisualizer.java @@ -26,8 +26,8 @@ import org.checkerframework.framework.type.visitor.AnnotatedTypeVisitor; import org.checkerframework.framework.util.DefaultAnnotationFormatter; import org.checkerframework.framework.util.ExecUtil; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; /** * TypeVisualizer prints AnnotatedTypeMirrors as a directed graph where each node is a type and an diff --git a/framework/src/org/checkerframework/common/util/count/AnnotationStatistics.java b/framework/src/main/java/org/checkerframework/common/util/count/AnnotationStatistics.java similarity index 100% rename from framework/src/org/checkerframework/common/util/count/AnnotationStatistics.java rename to framework/src/main/java/org/checkerframework/common/util/count/AnnotationStatistics.java diff --git a/framework/src/org/checkerframework/common/util/count/JavaCodeStatistics.java b/framework/src/main/java/org/checkerframework/common/util/count/JavaCodeStatistics.java similarity index 100% rename from framework/src/org/checkerframework/common/util/count/JavaCodeStatistics.java rename to framework/src/main/java/org/checkerframework/common/util/count/JavaCodeStatistics.java diff --git a/framework/src/org/checkerframework/common/util/debug/EmptyProcessor.java b/framework/src/main/java/org/checkerframework/common/util/debug/EmptyProcessor.java similarity index 100% rename from framework/src/org/checkerframework/common/util/debug/EmptyProcessor.java rename to framework/src/main/java/org/checkerframework/common/util/debug/EmptyProcessor.java diff --git a/framework/src/org/checkerframework/common/util/debug/SignaturePrinter.java b/framework/src/main/java/org/checkerframework/common/util/debug/SignaturePrinter.java similarity index 100% rename from framework/src/org/checkerframework/common/util/debug/SignaturePrinter.java rename to framework/src/main/java/org/checkerframework/common/util/debug/SignaturePrinter.java diff --git a/framework/src/org/checkerframework/common/util/debug/TreeDebug.java b/framework/src/main/java/org/checkerframework/common/util/debug/TreeDebug.java similarity index 100% rename from framework/src/org/checkerframework/common/util/debug/TreeDebug.java rename to framework/src/main/java/org/checkerframework/common/util/debug/TreeDebug.java diff --git a/framework/src/org/checkerframework/common/util/debug/TreePrinter.java b/framework/src/main/java/org/checkerframework/common/util/debug/TreePrinter.java similarity index 100% rename from framework/src/org/checkerframework/common/util/debug/TreePrinter.java rename to framework/src/main/java/org/checkerframework/common/util/debug/TreePrinter.java diff --git a/framework/src/org/checkerframework/common/util/debug/TypeOutputtingChecker.java b/framework/src/main/java/org/checkerframework/common/util/debug/TypeOutputtingChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/util/debug/TypeOutputtingChecker.java rename to framework/src/main/java/org/checkerframework/common/util/debug/TypeOutputtingChecker.java diff --git a/framework/src/org/checkerframework/common/util/report/README b/framework/src/main/java/org/checkerframework/common/util/report/README similarity index 100% rename from framework/src/org/checkerframework/common/util/report/README rename to framework/src/main/java/org/checkerframework/common/util/report/README diff --git a/framework/src/org/checkerframework/common/util/report/ReportChecker.java b/framework/src/main/java/org/checkerframework/common/util/report/ReportChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/ReportChecker.java rename to framework/src/main/java/org/checkerframework/common/util/report/ReportChecker.java diff --git a/framework/src/org/checkerframework/common/util/report/ReportVisitor.java b/framework/src/main/java/org/checkerframework/common/util/report/ReportVisitor.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/ReportVisitor.java rename to framework/src/main/java/org/checkerframework/common/util/report/ReportVisitor.java diff --git a/framework/src/org/checkerframework/common/util/report/messages.properties b/framework/src/main/java/org/checkerframework/common/util/report/messages.properties similarity index 100% rename from framework/src/org/checkerframework/common/util/report/messages.properties rename to framework/src/main/java/org/checkerframework/common/util/report/messages.properties diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportCall.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportCall.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportCall.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportCall.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportCreation.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportCreation.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportCreation.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportCreation.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportInherit.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportInherit.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportInherit.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportInherit.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportOverride.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportOverride.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportOverride.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportOverride.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportReadWrite.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportReadWrite.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportReadWrite.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportReadWrite.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportUnqualified.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportUnqualified.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportUnqualified.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportUnqualified.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportUse.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportUse.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportUse.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportUse.java diff --git a/framework/src/org/checkerframework/common/util/report/qual/ReportWrite.java b/framework/src/main/java/org/checkerframework/common/util/report/qual/ReportWrite.java similarity index 100% rename from framework/src/org/checkerframework/common/util/report/qual/ReportWrite.java rename to framework/src/main/java/org/checkerframework/common/util/report/qual/ReportWrite.java diff --git a/framework/src/org/checkerframework/common/value/RangeOrListOfValues.java b/framework/src/main/java/org/checkerframework/common/value/RangeOrListOfValues.java similarity index 98% rename from framework/src/org/checkerframework/common/value/RangeOrListOfValues.java rename to framework/src/main/java/org/checkerframework/common/value/RangeOrListOfValues.java index 2f470b1c950..c471c4d9d9f 100644 --- a/framework/src/org/checkerframework/common/value/RangeOrListOfValues.java +++ b/framework/src/main/java/org/checkerframework/common/value/RangeOrListOfValues.java @@ -9,7 +9,7 @@ import org.checkerframework.common.value.qual.IntVal; import org.checkerframework.common.value.util.Range; import org.checkerframework.framework.type.AnnotatedTypeMirror; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * An abstraction that can be either a range or a list of values that could come from an {@link diff --git a/framework/src/org/checkerframework/common/value/ReflectiveEvaluator.java b/framework/src/main/java/org/checkerframework/common/value/ReflectiveEvaluator.java similarity index 99% rename from framework/src/org/checkerframework/common/value/ReflectiveEvaluator.java rename to framework/src/main/java/org/checkerframework/common/value/ReflectiveEvaluator.java index ed848766152..dd031be8834 100644 --- a/framework/src/org/checkerframework/common/value/ReflectiveEvaluator.java +++ b/framework/src/main/java/org/checkerframework/common/value/ReflectiveEvaluator.java @@ -20,8 +20,8 @@ import javax.lang.model.type.TypeMirror; import org.checkerframework.common.basetype.BaseTypeChecker; import org.checkerframework.framework.source.Result; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ElementUtils; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; import org.checkerframework.javacutil.TypesUtils; diff --git a/framework/src/org/checkerframework/common/value/ValueAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/common/value/ValueAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/common/value/ValueAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/common/value/ValueChecker.java b/framework/src/main/java/org/checkerframework/common/value/ValueChecker.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueChecker.java rename to framework/src/main/java/org/checkerframework/common/value/ValueChecker.java diff --git a/framework/src/org/checkerframework/common/value/ValueCheckerUtils.java b/framework/src/main/java/org/checkerframework/common/value/ValueCheckerUtils.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueCheckerUtils.java rename to framework/src/main/java/org/checkerframework/common/value/ValueCheckerUtils.java diff --git a/framework/src/org/checkerframework/common/value/ValueMethodIdentifier.java b/framework/src/main/java/org/checkerframework/common/value/ValueMethodIdentifier.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueMethodIdentifier.java rename to framework/src/main/java/org/checkerframework/common/value/ValueMethodIdentifier.java diff --git a/framework/src/org/checkerframework/common/value/ValueTransfer.java b/framework/src/main/java/org/checkerframework/common/value/ValueTransfer.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueTransfer.java rename to framework/src/main/java/org/checkerframework/common/value/ValueTransfer.java diff --git a/framework/src/org/checkerframework/common/value/ValueVisitor.java b/framework/src/main/java/org/checkerframework/common/value/ValueVisitor.java similarity index 100% rename from framework/src/org/checkerframework/common/value/ValueVisitor.java rename to framework/src/main/java/org/checkerframework/common/value/ValueVisitor.java diff --git a/framework/src/org/checkerframework/common/value/messages.properties b/framework/src/main/java/org/checkerframework/common/value/messages.properties similarity index 100% rename from framework/src/org/checkerframework/common/value/messages.properties rename to framework/src/main/java/org/checkerframework/common/value/messages.properties diff --git a/framework/src/org/checkerframework/common/value/qual/ArrayLen.java b/framework/src/main/java/org/checkerframework/common/value/qual/ArrayLen.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/ArrayLen.java rename to framework/src/main/java/org/checkerframework/common/value/qual/ArrayLen.java diff --git a/framework/src/org/checkerframework/common/value/qual/ArrayLenRange.java b/framework/src/main/java/org/checkerframework/common/value/qual/ArrayLenRange.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/ArrayLenRange.java rename to framework/src/main/java/org/checkerframework/common/value/qual/ArrayLenRange.java diff --git a/framework/src/org/checkerframework/common/value/qual/BoolVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/BoolVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/BoolVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/BoolVal.java diff --git a/framework/src/org/checkerframework/common/value/qual/BottomVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/BottomVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/BottomVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/BottomVal.java diff --git a/framework/src/org/checkerframework/common/value/qual/DoubleVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/DoubleVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/DoubleVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/DoubleVal.java diff --git a/framework/src/org/checkerframework/common/value/qual/EnsuresMinLenIf.java b/framework/src/main/java/org/checkerframework/common/value/qual/EnsuresMinLenIf.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/EnsuresMinLenIf.java rename to framework/src/main/java/org/checkerframework/common/value/qual/EnsuresMinLenIf.java diff --git a/framework/src/org/checkerframework/common/value/qual/IntRange.java b/framework/src/main/java/org/checkerframework/common/value/qual/IntRange.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/IntRange.java rename to framework/src/main/java/org/checkerframework/common/value/qual/IntRange.java diff --git a/framework/src/org/checkerframework/common/value/qual/IntRangeFromGTENegativeOne.java b/framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromGTENegativeOne.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/IntRangeFromGTENegativeOne.java rename to framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromGTENegativeOne.java diff --git a/framework/src/org/checkerframework/common/value/qual/IntRangeFromNonNegative.java b/framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromNonNegative.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/IntRangeFromNonNegative.java rename to framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromNonNegative.java diff --git a/framework/src/org/checkerframework/common/value/qual/IntRangeFromPositive.java b/framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromPositive.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/IntRangeFromPositive.java rename to framework/src/main/java/org/checkerframework/common/value/qual/IntRangeFromPositive.java diff --git a/framework/src/org/checkerframework/common/value/qual/IntVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/IntVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/IntVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/IntVal.java diff --git a/framework/src/org/checkerframework/common/value/qual/MinLen.java b/framework/src/main/java/org/checkerframework/common/value/qual/MinLen.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/MinLen.java rename to framework/src/main/java/org/checkerframework/common/value/qual/MinLen.java diff --git a/framework/src/org/checkerframework/common/value/qual/MinLenFieldInvariant.java b/framework/src/main/java/org/checkerframework/common/value/qual/MinLenFieldInvariant.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/MinLenFieldInvariant.java rename to framework/src/main/java/org/checkerframework/common/value/qual/MinLenFieldInvariant.java diff --git a/framework/src/org/checkerframework/common/value/qual/PolyValue.java b/framework/src/main/java/org/checkerframework/common/value/qual/PolyValue.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/PolyValue.java rename to framework/src/main/java/org/checkerframework/common/value/qual/PolyValue.java diff --git a/framework/src/org/checkerframework/common/value/qual/StaticallyExecutable.java b/framework/src/main/java/org/checkerframework/common/value/qual/StaticallyExecutable.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/StaticallyExecutable.java rename to framework/src/main/java/org/checkerframework/common/value/qual/StaticallyExecutable.java diff --git a/framework/src/org/checkerframework/common/value/qual/StringVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/StringVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/StringVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/StringVal.java diff --git a/framework/src/org/checkerframework/common/value/qual/UnknownVal.java b/framework/src/main/java/org/checkerframework/common/value/qual/UnknownVal.java similarity index 100% rename from framework/src/org/checkerframework/common/value/qual/UnknownVal.java rename to framework/src/main/java/org/checkerframework/common/value/qual/UnknownVal.java diff --git a/framework/src/org/checkerframework/common/value/statically-executable.astub b/framework/src/main/java/org/checkerframework/common/value/statically-executable.astub similarity index 100% rename from framework/src/org/checkerframework/common/value/statically-executable.astub rename to framework/src/main/java/org/checkerframework/common/value/statically-executable.astub diff --git a/framework/src/org/checkerframework/common/value/util/ByteMath.java b/framework/src/main/java/org/checkerframework/common/value/util/ByteMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/ByteMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/ByteMath.java diff --git a/framework/src/org/checkerframework/common/value/util/DoubleMath.java b/framework/src/main/java/org/checkerframework/common/value/util/DoubleMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/DoubleMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/DoubleMath.java diff --git a/framework/src/org/checkerframework/common/value/util/FloatMath.java b/framework/src/main/java/org/checkerframework/common/value/util/FloatMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/FloatMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/FloatMath.java diff --git a/framework/src/org/checkerframework/common/value/util/IntegerMath.java b/framework/src/main/java/org/checkerframework/common/value/util/IntegerMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/IntegerMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/IntegerMath.java diff --git a/framework/src/org/checkerframework/common/value/util/LongMath.java b/framework/src/main/java/org/checkerframework/common/value/util/LongMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/LongMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/LongMath.java diff --git a/framework/src/org/checkerframework/common/value/util/NumberMath.java b/framework/src/main/java/org/checkerframework/common/value/util/NumberMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/NumberMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/NumberMath.java diff --git a/framework/src/org/checkerframework/common/value/util/NumberUtils.java b/framework/src/main/java/org/checkerframework/common/value/util/NumberUtils.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/NumberUtils.java rename to framework/src/main/java/org/checkerframework/common/value/util/NumberUtils.java diff --git a/framework/src/org/checkerframework/common/value/util/Range.java b/framework/src/main/java/org/checkerframework/common/value/util/Range.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/Range.java rename to framework/src/main/java/org/checkerframework/common/value/util/Range.java diff --git a/framework/src/org/checkerframework/common/value/util/ShortMath.java b/framework/src/main/java/org/checkerframework/common/value/util/ShortMath.java similarity index 100% rename from framework/src/org/checkerframework/common/value/util/ShortMath.java rename to framework/src/main/java/org/checkerframework/common/value/util/ShortMath.java diff --git a/framework/src/org/checkerframework/common/wholeprograminference/AnnotationConverter.java b/framework/src/main/java/org/checkerframework/common/wholeprograminference/AnnotationConverter.java similarity index 100% rename from framework/src/org/checkerframework/common/wholeprograminference/AnnotationConverter.java rename to framework/src/main/java/org/checkerframework/common/wholeprograminference/AnnotationConverter.java diff --git a/framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInference.java b/framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInference.java similarity index 100% rename from framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInference.java rename to framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInference.java diff --git a/framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenes.java b/framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenes.java similarity index 100% rename from framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenes.java rename to framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenes.java diff --git a/framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenesHelper.java b/framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenesHelper.java similarity index 100% rename from framework/src/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenesHelper.java rename to framework/src/main/java/org/checkerframework/common/wholeprograminference/WholeProgramInferenceScenesHelper.java diff --git a/framework/src/org/checkerframework/framework/flow/CFAbstractAnalysis.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractAnalysis.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFAbstractAnalysis.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFAbstractAnalysis.java diff --git a/framework/src/org/checkerframework/framework/flow/CFAbstractStore.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractStore.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFAbstractStore.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFAbstractStore.java diff --git a/framework/src/org/checkerframework/framework/flow/CFAbstractTransfer.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFAbstractTransfer.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java diff --git a/framework/src/org/checkerframework/framework/flow/CFAbstractValue.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractValue.java similarity index 99% rename from framework/src/org/checkerframework/framework/flow/CFAbstractValue.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFAbstractValue.java index 4a6017a15f8..da307037db6 100644 --- a/framework/src/org/checkerframework/framework/flow/CFAbstractValue.java +++ b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractValue.java @@ -20,8 +20,8 @@ import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedWildcardType; import org.checkerframework.framework.type.QualifierHierarchy; import org.checkerframework.framework.util.AnnotatedTypes; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AnnotationUtils; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/flow/CFAnalysis.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAnalysis.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFAnalysis.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFAnalysis.java diff --git a/framework/src/org/checkerframework/framework/flow/CFCFGBuilder.java b/framework/src/main/java/org/checkerframework/framework/flow/CFCFGBuilder.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFCFGBuilder.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFCFGBuilder.java diff --git a/framework/src/org/checkerframework/framework/flow/CFStore.java b/framework/src/main/java/org/checkerframework/framework/flow/CFStore.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFStore.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFStore.java diff --git a/framework/src/org/checkerframework/framework/flow/CFTransfer.java b/framework/src/main/java/org/checkerframework/framework/flow/CFTransfer.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFTransfer.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFTransfer.java diff --git a/framework/src/org/checkerframework/framework/flow/CFTreeBuilder.java b/framework/src/main/java/org/checkerframework/framework/flow/CFTreeBuilder.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFTreeBuilder.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFTreeBuilder.java diff --git a/framework/src/org/checkerframework/framework/flow/CFValue.java b/framework/src/main/java/org/checkerframework/framework/flow/CFValue.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/CFValue.java rename to framework/src/main/java/org/checkerframework/framework/flow/CFValue.java diff --git a/framework/src/org/checkerframework/framework/flow/package-info.java b/framework/src/main/java/org/checkerframework/framework/flow/package-info.java similarity index 100% rename from framework/src/org/checkerframework/framework/flow/package-info.java rename to framework/src/main/java/org/checkerframework/framework/flow/package-info.java diff --git a/framework/src/org/checkerframework/framework/qual/AnnotatedFor.java b/framework/src/main/java/org/checkerframework/framework/qual/AnnotatedFor.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/AnnotatedFor.java rename to framework/src/main/java/org/checkerframework/framework/qual/AnnotatedFor.java diff --git a/framework/src/org/checkerframework/framework/qual/Bottom.java b/framework/src/main/java/org/checkerframework/framework/qual/Bottom.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/Bottom.java rename to framework/src/main/java/org/checkerframework/framework/qual/Bottom.java diff --git a/framework/src/org/checkerframework/framework/qual/ConditionalPostconditionAnnotation.java b/framework/src/main/java/org/checkerframework/framework/qual/ConditionalPostconditionAnnotation.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/ConditionalPostconditionAnnotation.java rename to framework/src/main/java/org/checkerframework/framework/qual/ConditionalPostconditionAnnotation.java diff --git a/framework/src/org/checkerframework/framework/qual/Covariant.java b/framework/src/main/java/org/checkerframework/framework/qual/Covariant.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/Covariant.java rename to framework/src/main/java/org/checkerframework/framework/qual/Covariant.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultFor.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultFor.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultFor.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultFor.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultInUncheckedCodeFor.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultInUncheckedCodeFor.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultInUncheckedCodeFor.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultInUncheckedCodeFor.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultQualifierInHierarchy.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifierInHierarchy.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultQualifierInHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifierInHierarchy.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultQualifierInHierarchyInUncheckedCode.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifierInHierarchyInUncheckedCode.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultQualifierInHierarchyInUncheckedCode.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifierInHierarchyInUncheckedCode.java diff --git a/framework/src/org/checkerframework/framework/qual/DefaultQualifiers.java b/framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifiers.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/DefaultQualifiers.java rename to framework/src/main/java/org/checkerframework/framework/qual/DefaultQualifiers.java diff --git a/framework/src/org/checkerframework/framework/qual/EnsuresQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/EnsuresQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/EnsuresQualifierIf.java b/framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifierIf.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/EnsuresQualifierIf.java rename to framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifierIf.java diff --git a/framework/src/org/checkerframework/framework/qual/EnsuresQualifiers.java b/framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifiers.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/EnsuresQualifiers.java rename to framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifiers.java diff --git a/framework/src/org/checkerframework/framework/qual/EnsuresQualifiersIf.java b/framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifiersIf.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/EnsuresQualifiersIf.java rename to framework/src/main/java/org/checkerframework/framework/qual/EnsuresQualifiersIf.java diff --git a/framework/src/org/checkerframework/framework/qual/FieldInvariant.java b/framework/src/main/java/org/checkerframework/framework/qual/FieldInvariant.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/FieldInvariant.java rename to framework/src/main/java/org/checkerframework/framework/qual/FieldInvariant.java diff --git a/framework/src/org/checkerframework/framework/qual/FromByteCode.java b/framework/src/main/java/org/checkerframework/framework/qual/FromByteCode.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/FromByteCode.java rename to framework/src/main/java/org/checkerframework/framework/qual/FromByteCode.java diff --git a/framework/src/org/checkerframework/framework/qual/FromStubFile.java b/framework/src/main/java/org/checkerframework/framework/qual/FromStubFile.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/FromStubFile.java rename to framework/src/main/java/org/checkerframework/framework/qual/FromStubFile.java diff --git a/framework/src/org/checkerframework/framework/qual/IgnoreInWholeProgramInference.java b/framework/src/main/java/org/checkerframework/framework/qual/IgnoreInWholeProgramInference.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/IgnoreInWholeProgramInference.java rename to framework/src/main/java/org/checkerframework/framework/qual/IgnoreInWholeProgramInference.java diff --git a/framework/src/org/checkerframework/framework/qual/ImplicitFor.java b/framework/src/main/java/org/checkerframework/framework/qual/ImplicitFor.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/ImplicitFor.java rename to framework/src/main/java/org/checkerframework/framework/qual/ImplicitFor.java diff --git a/framework/src/org/checkerframework/framework/qual/InheritedAnnotation.java b/framework/src/main/java/org/checkerframework/framework/qual/InheritedAnnotation.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/InheritedAnnotation.java rename to framework/src/main/java/org/checkerframework/framework/qual/InheritedAnnotation.java diff --git a/framework/src/org/checkerframework/framework/qual/InvisibleQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/InvisibleQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/InvisibleQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/InvisibleQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/JavaExpression.java b/framework/src/main/java/org/checkerframework/framework/qual/JavaExpression.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/JavaExpression.java rename to framework/src/main/java/org/checkerframework/framework/qual/JavaExpression.java diff --git a/framework/src/org/checkerframework/framework/qual/LiteralKind.java b/framework/src/main/java/org/checkerframework/framework/qual/LiteralKind.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/LiteralKind.java rename to framework/src/main/java/org/checkerframework/framework/qual/LiteralKind.java diff --git a/framework/src/org/checkerframework/framework/qual/MonotonicQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/MonotonicQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/MonotonicQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/MonotonicQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/PolyAll.java b/framework/src/main/java/org/checkerframework/framework/qual/PolyAll.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/PolyAll.java rename to framework/src/main/java/org/checkerframework/framework/qual/PolyAll.java diff --git a/framework/src/org/checkerframework/framework/qual/PolymorphicQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/PolymorphicQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/PolymorphicQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/PolymorphicQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/PostconditionAnnotation.java b/framework/src/main/java/org/checkerframework/framework/qual/PostconditionAnnotation.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/PostconditionAnnotation.java rename to framework/src/main/java/org/checkerframework/framework/qual/PostconditionAnnotation.java diff --git a/framework/src/org/checkerframework/framework/qual/PreconditionAnnotation.java b/framework/src/main/java/org/checkerframework/framework/qual/PreconditionAnnotation.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/PreconditionAnnotation.java rename to framework/src/main/java/org/checkerframework/framework/qual/PreconditionAnnotation.java diff --git a/framework/src/org/checkerframework/framework/qual/QualifierArgument.java b/framework/src/main/java/org/checkerframework/framework/qual/QualifierArgument.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/QualifierArgument.java rename to framework/src/main/java/org/checkerframework/framework/qual/QualifierArgument.java diff --git a/framework/src/org/checkerframework/framework/qual/RelevantJavaTypes.java b/framework/src/main/java/org/checkerframework/framework/qual/RelevantJavaTypes.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/RelevantJavaTypes.java rename to framework/src/main/java/org/checkerframework/framework/qual/RelevantJavaTypes.java diff --git a/framework/src/org/checkerframework/framework/qual/RequiresQualifier.java b/framework/src/main/java/org/checkerframework/framework/qual/RequiresQualifier.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/RequiresQualifier.java rename to framework/src/main/java/org/checkerframework/framework/qual/RequiresQualifier.java diff --git a/framework/src/org/checkerframework/framework/qual/RequiresQualifiers.java b/framework/src/main/java/org/checkerframework/framework/qual/RequiresQualifiers.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/RequiresQualifiers.java rename to framework/src/main/java/org/checkerframework/framework/qual/RequiresQualifiers.java diff --git a/framework/src/org/checkerframework/framework/qual/StubFiles.java b/framework/src/main/java/org/checkerframework/framework/qual/StubFiles.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/StubFiles.java rename to framework/src/main/java/org/checkerframework/framework/qual/StubFiles.java diff --git a/framework/src/org/checkerframework/framework/qual/SubtypeOf.java b/framework/src/main/java/org/checkerframework/framework/qual/SubtypeOf.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/SubtypeOf.java rename to framework/src/main/java/org/checkerframework/framework/qual/SubtypeOf.java diff --git a/framework/src/org/checkerframework/framework/qual/TargetLocations.java b/framework/src/main/java/org/checkerframework/framework/qual/TargetLocations.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/TargetLocations.java rename to framework/src/main/java/org/checkerframework/framework/qual/TargetLocations.java diff --git a/framework/src/org/checkerframework/framework/qual/TypeKind.java b/framework/src/main/java/org/checkerframework/framework/qual/TypeKind.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/TypeKind.java rename to framework/src/main/java/org/checkerframework/framework/qual/TypeKind.java diff --git a/framework/src/org/checkerframework/framework/qual/TypeUseLocation.java b/framework/src/main/java/org/checkerframework/framework/qual/TypeUseLocation.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/TypeUseLocation.java rename to framework/src/main/java/org/checkerframework/framework/qual/TypeUseLocation.java diff --git a/framework/src/org/checkerframework/framework/qual/Unqualified.java b/framework/src/main/java/org/checkerframework/framework/qual/Unqualified.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/Unqualified.java rename to framework/src/main/java/org/checkerframework/framework/qual/Unqualified.java diff --git a/framework/src/org/checkerframework/framework/qual/Unused.java b/framework/src/main/java/org/checkerframework/framework/qual/Unused.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/Unused.java rename to framework/src/main/java/org/checkerframework/framework/qual/Unused.java diff --git a/framework/src/org/checkerframework/framework/qual/package-info.java b/framework/src/main/java/org/checkerframework/framework/qual/package-info.java similarity index 100% rename from framework/src/org/checkerframework/framework/qual/package-info.java rename to framework/src/main/java/org/checkerframework/framework/qual/package-info.java diff --git a/framework/src/org/checkerframework/framework/source/AggregateChecker.java b/framework/src/main/java/org/checkerframework/framework/source/AggregateChecker.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/AggregateChecker.java rename to framework/src/main/java/org/checkerframework/framework/source/AggregateChecker.java diff --git a/framework/src/org/checkerframework/framework/source/Result.java b/framework/src/main/java/org/checkerframework/framework/source/Result.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/Result.java rename to framework/src/main/java/org/checkerframework/framework/source/Result.java diff --git a/framework/src/org/checkerframework/framework/source/SourceChecker.java b/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java similarity index 99% rename from framework/src/org/checkerframework/framework/source/SourceChecker.java rename to framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java index 2a58bb92d55..ce65533b29e 100644 --- a/framework/src/org/checkerframework/framework/source/SourceChecker.java +++ b/framework/src/main/java/org/checkerframework/framework/source/SourceChecker.java @@ -51,13 +51,13 @@ import org.checkerframework.framework.util.CFContext; import org.checkerframework.framework.util.CheckerMain; import org.checkerframework.framework.util.OptionConfiguration; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AbstractTypeProcessor; import org.checkerframework.javacutil.AnnotationProvider; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ElementUtils; import org.checkerframework.javacutil.ErrorHandler; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; /** diff --git a/framework/src/org/checkerframework/framework/source/SourceVisitor.java b/framework/src/main/java/org/checkerframework/framework/source/SourceVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/SourceVisitor.java rename to framework/src/main/java/org/checkerframework/framework/source/SourceVisitor.java diff --git a/framework/src/org/checkerframework/framework/source/SupportedLintOptions.java b/framework/src/main/java/org/checkerframework/framework/source/SupportedLintOptions.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/SupportedLintOptions.java rename to framework/src/main/java/org/checkerframework/framework/source/SupportedLintOptions.java diff --git a/framework/src/org/checkerframework/framework/source/SupportedOptions.java b/framework/src/main/java/org/checkerframework/framework/source/SupportedOptions.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/SupportedOptions.java rename to framework/src/main/java/org/checkerframework/framework/source/SupportedOptions.java diff --git a/framework/src/org/checkerframework/framework/source/SuppressWarningsKeys.java b/framework/src/main/java/org/checkerframework/framework/source/SuppressWarningsKeys.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/SuppressWarningsKeys.java rename to framework/src/main/java/org/checkerframework/framework/source/SuppressWarningsKeys.java diff --git a/framework/src/org/checkerframework/framework/source/messages.properties b/framework/src/main/java/org/checkerframework/framework/source/messages.properties similarity index 100% rename from framework/src/org/checkerframework/framework/source/messages.properties rename to framework/src/main/java/org/checkerframework/framework/source/messages.properties diff --git a/framework/src/org/checkerframework/framework/source/package-info.java b/framework/src/main/java/org/checkerframework/framework/source/package-info.java similarity index 100% rename from framework/src/org/checkerframework/framework/source/package-info.java rename to framework/src/main/java/org/checkerframework/framework/source/package-info.java diff --git a/framework/src/org/checkerframework/framework/stub/AddAnnotatedFor.java b/framework/src/main/java/org/checkerframework/framework/stub/AddAnnotatedFor.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/AddAnnotatedFor.java rename to framework/src/main/java/org/checkerframework/framework/stub/AddAnnotatedFor.java diff --git a/framework/src/org/checkerframework/framework/stub/FileStubResource.java b/framework/src/main/java/org/checkerframework/framework/stub/FileStubResource.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/FileStubResource.java rename to framework/src/main/java/org/checkerframework/framework/stub/FileStubResource.java diff --git a/framework/src/org/checkerframework/framework/stub/JarEntryStubResource.java b/framework/src/main/java/org/checkerframework/framework/stub/JarEntryStubResource.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/JarEntryStubResource.java rename to framework/src/main/java/org/checkerframework/framework/stub/JarEntryStubResource.java diff --git a/framework/src/org/checkerframework/framework/stub/StubGenerator.java b/framework/src/main/java/org/checkerframework/framework/stub/StubGenerator.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/StubGenerator.java rename to framework/src/main/java/org/checkerframework/framework/stub/StubGenerator.java diff --git a/framework/src/org/checkerframework/framework/stub/StubParser.java b/framework/src/main/java/org/checkerframework/framework/stub/StubParser.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/StubParser.java rename to framework/src/main/java/org/checkerframework/framework/stub/StubParser.java diff --git a/framework/src/org/checkerframework/framework/stub/StubResource.java b/framework/src/main/java/org/checkerframework/framework/stub/StubResource.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/StubResource.java rename to framework/src/main/java/org/checkerframework/framework/stub/StubResource.java diff --git a/framework/src/org/checkerframework/framework/stub/StubUtil.java b/framework/src/main/java/org/checkerframework/framework/stub/StubUtil.java similarity index 100% rename from framework/src/org/checkerframework/framework/stub/StubUtil.java rename to framework/src/main/java/org/checkerframework/framework/stub/StubUtil.java diff --git a/framework/src/org/checkerframework/framework/stub/ToIndexFileConverter.java b/framework/src/main/java/org/checkerframework/framework/stub/ToIndexFileConverter.java similarity index 99% rename from framework/src/org/checkerframework/framework/stub/ToIndexFileConverter.java rename to framework/src/main/java/org/checkerframework/framework/stub/ToIndexFileConverter.java index a924aacb793..19e38f1a469 100644 --- a/framework/src/org/checkerframework/framework/stub/ToIndexFileConverter.java +++ b/framework/src/main/java/org/checkerframework/framework/stub/ToIndexFileConverter.java @@ -50,8 +50,8 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import scenelib.annotations.Annotation; import scenelib.annotations.el.AClass; import scenelib.annotations.el.ADeclaration; diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeCopier.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeCopier.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeCopier.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeCopier.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeFormatter.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFormatter.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeFormatter.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFormatter.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeMirror.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeParameterBounds.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeParameterBounds.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeParameterBounds.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeParameterBounds.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotatedTypeReplacer.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeReplacer.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotatedTypeReplacer.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeReplacer.java diff --git a/framework/src/org/checkerframework/framework/type/AnnotationClassLoader.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotationClassLoader.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AnnotationClassLoader.java rename to framework/src/main/java/org/checkerframework/framework/type/AnnotationClassLoader.java diff --git a/framework/src/org/checkerframework/framework/type/AsSuperVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/AsSuperVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/AsSuperVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/AsSuperVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/BoundsInitializer.java b/framework/src/main/java/org/checkerframework/framework/type/BoundsInitializer.java similarity index 99% rename from framework/src/org/checkerframework/framework/type/BoundsInitializer.java rename to framework/src/main/java/org/checkerframework/framework/type/BoundsInitializer.java index 4a9acc40304..d709f6bcef6 100644 --- a/framework/src/org/checkerframework/framework/type/BoundsInitializer.java +++ b/framework/src/main/java/org/checkerframework/framework/type/BoundsInitializer.java @@ -34,8 +34,8 @@ import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedUnionType; import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedWildcardType; import org.checkerframework.framework.type.visitor.AnnotatedTypeVisitor; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/type/DeclarationsIntoElements.java b/framework/src/main/java/org/checkerframework/framework/type/DeclarationsIntoElements.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/DeclarationsIntoElements.java rename to framework/src/main/java/org/checkerframework/framework/type/DeclarationsIntoElements.java diff --git a/framework/src/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java b/framework/src/main/java/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java similarity index 99% rename from framework/src/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java rename to framework/src/main/java/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java index 85fa16845b3..67c0c566b0e 100644 --- a/framework/src/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java +++ b/framework/src/main/java/org/checkerframework/framework/type/DefaultAnnotatedTypeFormatter.java @@ -22,7 +22,7 @@ import org.checkerframework.framework.type.visitor.AnnotatedTypeVisitor; import org.checkerframework.framework.util.AnnotationFormatter; import org.checkerframework.framework.util.DefaultAnnotationFormatter; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypeAnnotationUtils; /** diff --git a/framework/src/org/checkerframework/framework/type/DefaultInferredTypesApplier.java b/framework/src/main/java/org/checkerframework/framework/type/DefaultInferredTypesApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/DefaultInferredTypesApplier.java rename to framework/src/main/java/org/checkerframework/framework/type/DefaultInferredTypesApplier.java diff --git a/framework/src/org/checkerframework/framework/type/DefaultRawnessComparer.java b/framework/src/main/java/org/checkerframework/framework/type/DefaultRawnessComparer.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/DefaultRawnessComparer.java rename to framework/src/main/java/org/checkerframework/framework/type/DefaultRawnessComparer.java diff --git a/framework/src/org/checkerframework/framework/type/DefaultTypeHierarchy.java b/framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java similarity index 99% rename from framework/src/org/checkerframework/framework/type/DefaultTypeHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java index 7f83c2aa9ec..91c247ddbf3 100644 --- a/framework/src/org/checkerframework/framework/type/DefaultTypeHierarchy.java +++ b/framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java @@ -30,11 +30,11 @@ import org.checkerframework.framework.type.visitor.VisitHistory; import org.checkerframework.framework.util.AnnotatedTypes; import org.checkerframework.framework.util.AtmCombo; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.framework.util.TypeArgumentMapper; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ErrorReporter; import org.checkerframework.javacutil.Pair; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/type/ElementAnnotationApplier.java b/framework/src/main/java/org/checkerframework/framework/type/ElementAnnotationApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/ElementAnnotationApplier.java rename to framework/src/main/java/org/checkerframework/framework/type/ElementAnnotationApplier.java diff --git a/framework/src/org/checkerframework/framework/type/EqualityAtmComparer.java b/framework/src/main/java/org/checkerframework/framework/type/EqualityAtmComparer.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/EqualityAtmComparer.java rename to framework/src/main/java/org/checkerframework/framework/type/EqualityAtmComparer.java diff --git a/framework/src/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/framework/type/GenericAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/framework/type/HashcodeAtmVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/HashcodeAtmVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/HashcodeAtmVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/HashcodeAtmVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/QualifierHierarchy.java b/framework/src/main/java/org/checkerframework/framework/type/QualifierHierarchy.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/QualifierHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/type/QualifierHierarchy.java diff --git a/framework/src/org/checkerframework/framework/type/StructuralEqualityComparer.java b/framework/src/main/java/org/checkerframework/framework/type/StructuralEqualityComparer.java similarity index 99% rename from framework/src/org/checkerframework/framework/type/StructuralEqualityComparer.java rename to framework/src/main/java/org/checkerframework/framework/type/StructuralEqualityComparer.java index 497dc51be12..ebd609e3461 100644 --- a/framework/src/org/checkerframework/framework/type/StructuralEqualityComparer.java +++ b/framework/src/main/java/org/checkerframework/framework/type/StructuralEqualityComparer.java @@ -17,9 +17,9 @@ import org.checkerframework.framework.type.visitor.VisitHistory; import org.checkerframework.framework.util.AnnotatedTypes; import org.checkerframework.framework.util.AtmCombo; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/type/SupertypeFinder.java b/framework/src/main/java/org/checkerframework/framework/type/SupertypeFinder.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/SupertypeFinder.java rename to framework/src/main/java/org/checkerframework/framework/type/SupertypeFinder.java diff --git a/framework/src/org/checkerframework/framework/type/SyntheticArrays.java b/framework/src/main/java/org/checkerframework/framework/type/SyntheticArrays.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/SyntheticArrays.java rename to framework/src/main/java/org/checkerframework/framework/type/SyntheticArrays.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromClassVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromClassVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromClassVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromClassVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromExpressionVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromExpressionVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromExpressionVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromExpressionVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromMemberVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromMemberVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromMemberVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromMemberVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromTree.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromTree.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromTree.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromTree.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromTreeVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromTreeVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromTreeVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromTreeVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeFromTypeTreeVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/TypeHierarchy.java b/framework/src/main/java/org/checkerframework/framework/type/TypeHierarchy.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeHierarchy.java diff --git a/framework/src/org/checkerframework/framework/type/TypeVariableSubstitutor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeVariableSubstitutor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypeVariableSubstitutor.java rename to framework/src/main/java/org/checkerframework/framework/type/TypeVariableSubstitutor.java diff --git a/framework/src/org/checkerframework/framework/type/TypesIntoElements.java b/framework/src/main/java/org/checkerframework/framework/type/TypesIntoElements.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/TypesIntoElements.java rename to framework/src/main/java/org/checkerframework/framework/type/TypesIntoElements.java diff --git a/framework/src/org/checkerframework/framework/type/VisitorState.java b/framework/src/main/java/org/checkerframework/framework/type/VisitorState.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/VisitorState.java rename to framework/src/main/java/org/checkerframework/framework/type/VisitorState.java diff --git a/framework/src/org/checkerframework/framework/type/package-info.java b/framework/src/main/java/org/checkerframework/framework/type/package-info.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/package-info.java rename to framework/src/main/java/org/checkerframework/framework/type/package-info.java diff --git a/framework/src/org/checkerframework/framework/type/treeannotator/DebugListTreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/treeannotator/DebugListTreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/treeannotator/DebugListTreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/treeannotator/DebugListTreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/treeannotator/ImplicitsTreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/treeannotator/ImplicitsTreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/treeannotator/ImplicitsTreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/treeannotator/ImplicitsTreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/treeannotator/ListTreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/treeannotator/ListTreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/treeannotator/ListTreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/treeannotator/ListTreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/treeannotator/PropagationTreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/treeannotator/PropagationTreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/treeannotator/PropagationTreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/treeannotator/PropagationTreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/treeannotator/TreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/treeannotator/TreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/treeannotator/TreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/treeannotator/TreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/typeannotator/ImplicitsTypeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/typeannotator/ImplicitsTypeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/typeannotator/ImplicitsTypeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/typeannotator/ImplicitsTypeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/typeannotator/IrrelevantTypeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/typeannotator/IrrelevantTypeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/typeannotator/IrrelevantTypeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/typeannotator/IrrelevantTypeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/typeannotator/ListTypeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/typeannotator/ListTypeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/typeannotator/ListTypeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/typeannotator/ListTypeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/typeannotator/PropagationTypeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/typeannotator/PropagationTypeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/typeannotator/PropagationTypeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/typeannotator/PropagationTypeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/typeannotator/TypeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/type/typeannotator/TypeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/typeannotator/TypeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/type/typeannotator/TypeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AbstractAtmComboVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AbstractAtmComboVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AbstractAtmComboVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AbstractAtmComboVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeComparer.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeComparer.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeComparer.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeComparer.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeMerger.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeScanner.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeScanner.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeScanner.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeScanner.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AnnotatedTypeVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AnnotatedTypeVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/AtmComboVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AtmComboVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/AtmComboVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/AtmComboVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/EquivalentAtmComboScanner.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/EquivalentAtmComboScanner.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/EquivalentAtmComboScanner.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/EquivalentAtmComboScanner.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeScanner.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeScanner.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeScanner.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeScanner.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeVisitor.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/SimpleAnnotatedTypeVisitor.java diff --git a/framework/src/org/checkerframework/framework/type/visitor/VisitHistory.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/VisitHistory.java similarity index 97% rename from framework/src/org/checkerframework/framework/type/visitor/VisitHistory.java rename to framework/src/main/java/org/checkerframework/framework/type/visitor/VisitHistory.java index 98ab737679c..14734f6ef4d 100644 --- a/framework/src/org/checkerframework/framework/type/visitor/VisitHistory.java +++ b/framework/src/main/java/org/checkerframework/framework/type/visitor/VisitHistory.java @@ -3,8 +3,8 @@ import java.util.HashSet; import java.util.Set; import org.checkerframework.framework.type.AnnotatedTypeMirror; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.Pair; +import org.checkerframework.javacutil.PluginUtil; /** * IMPORTANT: DO NOT USE VisitHistory FOR VISITORS THAT UPDATE AN ANNOTATED TYPE MIRROR'S diff --git a/framework/src/org/checkerframework/framework/util/AnnotatedTypes.java b/framework/src/main/java/org/checkerframework/framework/util/AnnotatedTypes.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AnnotatedTypes.java rename to framework/src/main/java/org/checkerframework/framework/util/AnnotatedTypes.java diff --git a/framework/src/org/checkerframework/framework/util/AnnotationFormatter.java b/framework/src/main/java/org/checkerframework/framework/util/AnnotationFormatter.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AnnotationFormatter.java rename to framework/src/main/java/org/checkerframework/framework/util/AnnotationFormatter.java diff --git a/framework/src/org/checkerframework/framework/util/AnnotationMirrorMap.java b/framework/src/main/java/org/checkerframework/framework/util/AnnotationMirrorMap.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AnnotationMirrorMap.java rename to framework/src/main/java/org/checkerframework/framework/util/AnnotationMirrorMap.java diff --git a/framework/src/org/checkerframework/framework/util/AnnotationMirrorSet.java b/framework/src/main/java/org/checkerframework/framework/util/AnnotationMirrorSet.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AnnotationMirrorSet.java rename to framework/src/main/java/org/checkerframework/framework/util/AnnotationMirrorSet.java diff --git a/framework/src/org/checkerframework/framework/util/AtmCombo.java b/framework/src/main/java/org/checkerframework/framework/util/AtmCombo.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AtmCombo.java rename to framework/src/main/java/org/checkerframework/framework/util/AtmCombo.java diff --git a/framework/src/org/checkerframework/framework/util/AtmLubVisitor.java b/framework/src/main/java/org/checkerframework/framework/util/AtmLubVisitor.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/AtmLubVisitor.java rename to framework/src/main/java/org/checkerframework/framework/util/AtmLubVisitor.java diff --git a/framework/src/org/checkerframework/framework/util/BaseContext.java b/framework/src/main/java/org/checkerframework/framework/util/BaseContext.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/BaseContext.java rename to framework/src/main/java/org/checkerframework/framework/util/BaseContext.java diff --git a/framework/src/org/checkerframework/framework/util/CFContext.java b/framework/src/main/java/org/checkerframework/framework/util/CFContext.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/CFContext.java rename to framework/src/main/java/org/checkerframework/framework/util/CFContext.java diff --git a/framework/src/org/checkerframework/framework/util/CheckerDevelMain.java b/framework/src/main/java/org/checkerframework/framework/util/CheckerDevelMain.java similarity index 98% rename from framework/src/org/checkerframework/framework/util/CheckerDevelMain.java rename to framework/src/main/java/org/checkerframework/framework/util/CheckerDevelMain.java index d1d78a69778..eb63c2ef76d 100644 --- a/framework/src/org/checkerframework/framework/util/CheckerDevelMain.java +++ b/framework/src/main/java/org/checkerframework/framework/util/CheckerDevelMain.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.checkerframework.javacutil.PluginUtil; public class CheckerDevelMain extends CheckerMain { diff --git a/framework/src/org/checkerframework/framework/util/CheckerMain.java b/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/CheckerMain.java rename to framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java index 575741a2e50..bffa78d9836 100644 --- a/framework/src/org/checkerframework/framework/util/CheckerMain.java +++ b/framework/src/main/java/org/checkerframework/framework/util/CheckerMain.java @@ -16,6 +16,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.ZipEntry; +import org.checkerframework.javacutil.PluginUtil; /** * This class behaves similarly to javac. CheckerMain does the following: diff --git a/framework/src/org/checkerframework/framework/util/ComboLog.java b/framework/src/main/java/org/checkerframework/framework/util/ComboLog.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/ComboLog.java rename to framework/src/main/java/org/checkerframework/framework/util/ComboLog.java index 1a1560a0eb2..ff3d23568e3 100644 --- a/framework/src/org/checkerframework/framework/util/ComboLog.java +++ b/framework/src/main/java/org/checkerframework/framework/util/ComboLog.java @@ -11,6 +11,7 @@ import java.util.HashSet; import java.util.List; import org.checkerframework.framework.type.AnnotatedTypeMirror; +import org.checkerframework.javacutil.PluginUtil; /** * Created by jburke on 6/12/14. TODO: Document this class. It is currently not used within the diff --git a/framework/src/org/checkerframework/framework/util/ContractsUtils.java b/framework/src/main/java/org/checkerframework/framework/util/ContractsUtils.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/ContractsUtils.java rename to framework/src/main/java/org/checkerframework/framework/util/ContractsUtils.java diff --git a/framework/src/org/checkerframework/framework/util/DefaultAnnotationFormatter.java b/framework/src/main/java/org/checkerframework/framework/util/DefaultAnnotationFormatter.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/DefaultAnnotationFormatter.java rename to framework/src/main/java/org/checkerframework/framework/util/DefaultAnnotationFormatter.java diff --git a/framework/src/org/checkerframework/framework/util/ExecUtil.java b/framework/src/main/java/org/checkerframework/framework/util/ExecUtil.java similarity index 98% rename from framework/src/org/checkerframework/framework/util/ExecUtil.java rename to framework/src/main/java/org/checkerframework/framework/util/ExecUtil.java index 79fb1d72d32..6389d7ada86 100644 --- a/framework/src/org/checkerframework/framework/util/ExecUtil.java +++ b/framework/src/main/java/org/checkerframework/framework/util/ExecUtil.java @@ -8,6 +8,7 @@ import java.io.Reader; import java.io.Writer; import java.util.Arrays; +import org.checkerframework.javacutil.PluginUtil; public class ExecUtil { diff --git a/framework/src/org/checkerframework/framework/util/FieldInvariants.java b/framework/src/main/java/org/checkerframework/framework/util/FieldInvariants.java similarity index 98% rename from framework/src/org/checkerframework/framework/util/FieldInvariants.java rename to framework/src/main/java/org/checkerframework/framework/util/FieldInvariants.java index ec560a535ed..28e61eb1b2f 100644 --- a/framework/src/org/checkerframework/framework/util/FieldInvariants.java +++ b/framework/src/main/java/org/checkerframework/framework/util/FieldInvariants.java @@ -7,6 +7,7 @@ import org.checkerframework.framework.source.Result; import org.checkerframework.framework.type.AnnotatedTypeFactory; import org.checkerframework.framework.type.QualifierHierarchy; +import org.checkerframework.javacutil.PluginUtil; /** * Represents field invariants. A list of fields that have a specific qualifier in a class where diff --git a/framework/src/org/checkerframework/framework/util/FlowExpressionParseUtil.java b/framework/src/main/java/org/checkerframework/framework/util/FlowExpressionParseUtil.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/FlowExpressionParseUtil.java rename to framework/src/main/java/org/checkerframework/framework/util/FlowExpressionParseUtil.java diff --git a/framework/src/org/checkerframework/framework/util/GraphQualifierHierarchy.java b/framework/src/main/java/org/checkerframework/framework/util/GraphQualifierHierarchy.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/GraphQualifierHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/util/GraphQualifierHierarchy.java diff --git a/framework/src/org/checkerframework/framework/util/Heuristics.java b/framework/src/main/java/org/checkerframework/framework/util/Heuristics.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/Heuristics.java rename to framework/src/main/java/org/checkerframework/framework/util/Heuristics.java diff --git a/framework/src/org/checkerframework/framework/util/MultiGraphQualifierHierarchy.java b/framework/src/main/java/org/checkerframework/framework/util/MultiGraphQualifierHierarchy.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/MultiGraphQualifierHierarchy.java rename to framework/src/main/java/org/checkerframework/framework/util/MultiGraphQualifierHierarchy.java diff --git a/framework/src/org/checkerframework/framework/util/OptionConfiguration.java b/framework/src/main/java/org/checkerframework/framework/util/OptionConfiguration.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/OptionConfiguration.java rename to framework/src/main/java/org/checkerframework/framework/util/OptionConfiguration.java diff --git a/framework/src/org/checkerframework/framework/util/PurityAnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/util/PurityAnnotatedTypeFactory.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/PurityAnnotatedTypeFactory.java rename to framework/src/main/java/org/checkerframework/framework/util/PurityAnnotatedTypeFactory.java diff --git a/framework/src/org/checkerframework/framework/util/PurityChecker.java b/framework/src/main/java/org/checkerframework/framework/util/PurityChecker.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/PurityChecker.java rename to framework/src/main/java/org/checkerframework/framework/util/PurityChecker.java diff --git a/framework/src/org/checkerframework/framework/util/PurityUnqualified.java b/framework/src/main/java/org/checkerframework/framework/util/PurityUnqualified.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/PurityUnqualified.java rename to framework/src/main/java/org/checkerframework/framework/util/PurityUnqualified.java diff --git a/framework/src/org/checkerframework/framework/util/QualifierPolymorphism.java b/framework/src/main/java/org/checkerframework/framework/util/QualifierPolymorphism.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/QualifierPolymorphism.java rename to framework/src/main/java/org/checkerframework/framework/util/QualifierPolymorphism.java diff --git a/framework/src/org/checkerframework/framework/util/TreePathCacher.java b/framework/src/main/java/org/checkerframework/framework/util/TreePathCacher.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/TreePathCacher.java rename to framework/src/main/java/org/checkerframework/framework/util/TreePathCacher.java diff --git a/framework/src/org/checkerframework/framework/util/TypeArgumentMapper.java b/framework/src/main/java/org/checkerframework/framework/util/TypeArgumentMapper.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/TypeArgumentMapper.java rename to framework/src/main/java/org/checkerframework/framework/util/TypeArgumentMapper.java diff --git a/framework/src/org/checkerframework/framework/util/defaults/Default.java b/framework/src/main/java/org/checkerframework/framework/util/defaults/Default.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/defaults/Default.java rename to framework/src/main/java/org/checkerframework/framework/util/defaults/Default.java diff --git a/framework/src/org/checkerframework/framework/util/defaults/DefaultSet.java b/framework/src/main/java/org/checkerframework/framework/util/defaults/DefaultSet.java similarity index 94% rename from framework/src/org/checkerframework/framework/util/defaults/DefaultSet.java rename to framework/src/main/java/org/checkerframework/framework/util/defaults/DefaultSet.java index 833f42dc022..b54eaa0109d 100644 --- a/framework/src/org/checkerframework/framework/util/defaults/DefaultSet.java +++ b/framework/src/main/java/org/checkerframework/framework/util/defaults/DefaultSet.java @@ -2,7 +2,7 @@ import java.util.Comparator; import java.util.TreeSet; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * An ordered set of Defaults (see {@link org.checkerframework.framework.util.defaults.Default}). diff --git a/framework/src/org/checkerframework/framework/util/defaults/QualifierDefaults.java b/framework/src/main/java/org/checkerframework/framework/util/defaults/QualifierDefaults.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/defaults/QualifierDefaults.java rename to framework/src/main/java/org/checkerframework/framework/util/defaults/QualifierDefaults.java index 3fa842b2369..0e6934a8b74 100644 --- a/framework/src/org/checkerframework/framework/util/defaults/QualifierDefaults.java +++ b/framework/src/main/java/org/checkerframework/framework/util/defaults/QualifierDefaults.java @@ -42,12 +42,12 @@ import org.checkerframework.framework.type.QualifierHierarchy; import org.checkerframework.framework.type.visitor.AnnotatedTypeScanner; import org.checkerframework.framework.util.CheckerMain; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AnnotationBuilder; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.CollectionUtils; import org.checkerframework.javacutil.ElementUtils; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; import org.checkerframework.javacutil.TypesUtils; diff --git a/framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesError.java b/framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesError.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesError.java rename to framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesError.java diff --git a/framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java b/framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java rename to framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java index 0c90f9ab25b..a8cd2792256 100644 --- a/framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java +++ b/framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesHelper.java @@ -44,11 +44,11 @@ import org.checkerframework.framework.type.visitor.AnnotatedTypeScanner; import org.checkerframework.framework.util.FlowExpressionParseUtil; import org.checkerframework.framework.util.FlowExpressionParseUtil.FlowExpressionContext; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AnnotationBuilder; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ElementUtils; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; /** diff --git a/framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesTreeAnnotator.java b/framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesTreeAnnotator.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/dependenttypes/DependentTypesTreeAnnotator.java rename to framework/src/main/java/org/checkerframework/framework/util/dependenttypes/DependentTypesTreeAnnotator.java diff --git a/framework/src/org/checkerframework/framework/util/element/ClassTypeParamApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/ClassTypeParamApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/ClassTypeParamApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/ClassTypeParamApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/ElementAnnotationUtil.java b/framework/src/main/java/org/checkerframework/framework/util/element/ElementAnnotationUtil.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/element/ElementAnnotationUtil.java rename to framework/src/main/java/org/checkerframework/framework/util/element/ElementAnnotationUtil.java index 8e4afd08936..521765761c3 100644 --- a/framework/src/org/checkerframework/framework/util/element/ElementAnnotationUtil.java +++ b/framework/src/main/java/org/checkerframework/framework/util/element/ElementAnnotationUtil.java @@ -30,9 +30,9 @@ import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedWildcardType; import org.checkerframework.framework.type.ElementAnnotationApplier; import org.checkerframework.framework.util.AnnotatedTypes; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.AnnotationUtils; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/util/element/IndexedElementAnnotationApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/IndexedElementAnnotationApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/IndexedElementAnnotationApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/IndexedElementAnnotationApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/MethodApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/MethodApplier.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/element/MethodApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/MethodApplier.java index fa5a3f4f32b..f2aaed913c0 100644 --- a/framework/src/org/checkerframework/framework/util/element/MethodApplier.java +++ b/framework/src/main/java/org/checkerframework/framework/util/element/MethodApplier.java @@ -15,9 +15,9 @@ import org.checkerframework.framework.type.AnnotatedTypeMirror; import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedExecutableType; import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedTypeVariable; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ElementUtils; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; /** * Adds annotations from element to the return type, formal parameter types, type parameters, and diff --git a/framework/src/org/checkerframework/framework/util/element/MethodTypeParamApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/MethodTypeParamApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/MethodTypeParamApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/MethodTypeParamApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/ParamApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/ParamApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/ParamApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/ParamApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/SuperTypeApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/SuperTypeApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/SuperTypeApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/SuperTypeApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java index 0f2d8f3bd0e..e4eebed6838 100644 --- a/framework/src/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java +++ b/framework/src/main/java/org/checkerframework/framework/util/element/TargetedElementAnnotationApplier.java @@ -9,8 +9,8 @@ import javax.lang.model.element.Element; import javax.lang.model.type.TypeKind; import org.checkerframework.framework.type.AnnotatedTypeMirror; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; /** * TargetedElementAnnotationApplier filters annotations for an element into 3 groups. TARGETED diff --git a/framework/src/org/checkerframework/framework/util/element/TypeDeclarationApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/TypeDeclarationApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/TypeDeclarationApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/TypeDeclarationApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/TypeParamElementAnnotationApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/TypeParamElementAnnotationApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/TypeParamElementAnnotationApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/TypeParamElementAnnotationApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/TypeVarUseApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/TypeVarUseApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/TypeVarUseApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/TypeVarUseApplier.java diff --git a/framework/src/org/checkerframework/framework/util/element/VariableApplier.java b/framework/src/main/java/org/checkerframework/framework/util/element/VariableApplier.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/element/VariableApplier.java rename to framework/src/main/java/org/checkerframework/framework/util/element/VariableApplier.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java index 8fc756bcbb9..463783b2768 100644 --- a/framework/src/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java +++ b/framework/src/main/java/org/checkerframework/framework/util/typeinference/DefaultTypeArgumentInference.java @@ -30,7 +30,6 @@ import org.checkerframework.framework.type.TypeHierarchy; import org.checkerframework.framework.util.AnnotatedTypes; import org.checkerframework.framework.util.AnnotationMirrorSet; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.framework.util.typeinference.constraint.A2F; import org.checkerframework.framework.util.typeinference.constraint.A2FReducer; import org.checkerframework.framework.util.typeinference.constraint.AFConstraint; @@ -52,6 +51,7 @@ import org.checkerframework.framework.util.typeinference.solver.SupertypesSolver; import org.checkerframework.javacutil.ErrorReporter; import org.checkerframework.javacutil.Pair; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TreeUtils; import org.checkerframework.javacutil.TypeAnnotationUtils; import org.checkerframework.javacutil.TypesUtils; diff --git a/framework/src/org/checkerframework/framework/util/typeinference/GlbUtil.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/GlbUtil.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/GlbUtil.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/GlbUtil.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/TypeArgInferenceUtil.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/TypeArgInferenceUtil.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/TypeArgInferenceUtil.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/TypeArgInferenceUtil.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/TypeArgumentInference.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/TypeArgumentInference.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/TypeArgumentInference.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/TypeArgumentInference.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/A2F.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/A2F.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/A2F.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/A2F.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/A2FReducer.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/A2FReducer.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/A2FReducer.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/A2FReducer.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/AFConstraint.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFConstraint.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/AFConstraint.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFConstraint.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/AFReducer.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFReducer.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/AFReducer.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFReducer.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java index ffc774546cb..09db2107042 100644 --- a/framework/src/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java +++ b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/AFReducingVisitor.java @@ -16,9 +16,9 @@ import org.checkerframework.framework.type.DefaultTypeHierarchy; import org.checkerframework.framework.type.visitor.AbstractAtmComboVisitor; import org.checkerframework.framework.util.AnnotatedTypes; -import org.checkerframework.framework.util.PluginUtil; import org.checkerframework.framework.util.typeinference.TypeArgInferenceUtil; import org.checkerframework.javacutil.ErrorReporter; +import org.checkerframework.javacutil.PluginUtil; import org.checkerframework.javacutil.TypesUtils; /** diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/F2A.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/F2A.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/F2A.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/F2A.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/F2AReducer.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/F2AReducer.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/F2AReducer.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/F2AReducer.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/FIsA.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/FIsA.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/FIsA.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/FIsA.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java index a0a8d6faead..98e9e75a58a 100644 --- a/framework/src/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java +++ b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/FIsAReducer.java @@ -15,7 +15,7 @@ import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedWildcardType; import org.checkerframework.framework.type.DefaultTypeHierarchy; import org.checkerframework.framework.type.visitor.AbstractAtmComboVisitor; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * FIsAReducer takes an FIsA constraint that is not irreducible (@see AFConstraint.isIrreducible) diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/TIsU.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TIsU.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/TIsU.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TIsU.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/TSubU.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TSubU.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/TSubU.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TSubU.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/TSuperU.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TSuperU.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/TSuperU.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TSuperU.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/constraint/TUConstraint.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TUConstraint.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/constraint/TUConstraint.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/constraint/TUConstraint.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/ConstraintMap.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/ConstraintMap.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/ConstraintMap.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/ConstraintMap.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/ConstraintMapBuilder.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/ConstraintMapBuilder.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/ConstraintMapBuilder.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/ConstraintMapBuilder.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/EqualitiesSolver.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/EqualitiesSolver.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/EqualitiesSolver.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/EqualitiesSolver.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/InferenceResult.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/InferenceResult.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/InferenceResult.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/InferenceResult.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/InferredValue.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/InferredValue.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/InferredValue.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/InferredValue.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/SubtypesSolver.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/SubtypesSolver.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/SubtypesSolver.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/SubtypesSolver.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/SupertypesSolver.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/SupertypesSolver.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/SupertypesSolver.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/SupertypesSolver.java diff --git a/framework/src/org/checkerframework/framework/util/typeinference/solver/TargetConstraints.java b/framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/TargetConstraints.java similarity index 100% rename from framework/src/org/checkerframework/framework/util/typeinference/solver/TargetConstraints.java rename to framework/src/main/java/org/checkerframework/framework/util/typeinference/solver/TargetConstraints.java diff --git a/framework/src/org/jmlspecs/annotation/Pure.java b/framework/src/main/java/org/jmlspecs/annotation/Pure.java similarity index 100% rename from framework/src/org/jmlspecs/annotation/Pure.java rename to framework/src/main/java/org/jmlspecs/annotation/Pure.java diff --git a/framework/tests/test-lubglb/lubglb/LubGlbAnnotatedTypeFactory.java b/framework/src/test/java/lubglb/LubGlbAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/LubGlbAnnotatedTypeFactory.java rename to framework/src/test/java/lubglb/LubGlbAnnotatedTypeFactory.java diff --git a/framework/tests/test-lubglb/lubglb/LubGlbChecker.java b/framework/src/test/java/lubglb/LubGlbChecker.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/LubGlbChecker.java rename to framework/src/test/java/lubglb/LubGlbChecker.java diff --git a/framework/tests/test-lubglb/lubglb/quals/A.java b/framework/src/test/java/lubglb/quals/A.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/A.java rename to framework/src/test/java/lubglb/quals/A.java diff --git a/framework/tests/test-lubglb/lubglb/quals/B.java b/framework/src/test/java/lubglb/quals/B.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/B.java rename to framework/src/test/java/lubglb/quals/B.java diff --git a/framework/tests/test-lubglb/lubglb/quals/C.java b/framework/src/test/java/lubglb/quals/C.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/C.java rename to framework/src/test/java/lubglb/quals/C.java diff --git a/framework/tests/test-lubglb/lubglb/quals/D.java b/framework/src/test/java/lubglb/quals/D.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/D.java rename to framework/src/test/java/lubglb/quals/D.java diff --git a/framework/tests/test-lubglb/lubglb/quals/E.java b/framework/src/test/java/lubglb/quals/E.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/E.java rename to framework/src/test/java/lubglb/quals/E.java diff --git a/framework/tests/test-lubglb/lubglb/quals/F.java b/framework/src/test/java/lubglb/quals/F.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/F.java rename to framework/src/test/java/lubglb/quals/F.java diff --git a/framework/tests/test-lubglb/lubglb/quals/Poly.java b/framework/src/test/java/lubglb/quals/Poly.java similarity index 100% rename from framework/tests/test-lubglb/lubglb/quals/Poly.java rename to framework/src/test/java/lubglb/quals/Poly.java diff --git a/framework/tests/test-polyall/polyall/PolyAllAnnotatedTypeFactory.java b/framework/src/test/java/polyall/PolyAllAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/test-polyall/polyall/PolyAllAnnotatedTypeFactory.java rename to framework/src/test/java/polyall/PolyAllAnnotatedTypeFactory.java diff --git a/framework/tests/test-polyall/polyall/PolyAllChecker.java b/framework/src/test/java/polyall/PolyAllChecker.java similarity index 100% rename from framework/tests/test-polyall/polyall/PolyAllChecker.java rename to framework/src/test/java/polyall/PolyAllChecker.java diff --git a/framework/tests/test-polyall/polyall/PolyAllVisitor.java b/framework/src/test/java/polyall/PolyAllVisitor.java similarity index 100% rename from framework/tests/test-polyall/polyall/PolyAllVisitor.java rename to framework/src/test/java/polyall/PolyAllVisitor.java diff --git a/framework/tests/test-polyall/polyall/quals/H1Bot.java b/framework/src/test/java/polyall/quals/H1Bot.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1Bot.java rename to framework/src/test/java/polyall/quals/H1Bot.java diff --git a/framework/tests/test-polyall/polyall/quals/H1Invalid.java b/framework/src/test/java/polyall/quals/H1Invalid.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1Invalid.java rename to framework/src/test/java/polyall/quals/H1Invalid.java diff --git a/framework/tests/test-polyall/polyall/quals/H1Poly.java b/framework/src/test/java/polyall/quals/H1Poly.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1Poly.java rename to framework/src/test/java/polyall/quals/H1Poly.java diff --git a/framework/tests/test-polyall/polyall/quals/H1S1.java b/framework/src/test/java/polyall/quals/H1S1.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1S1.java rename to framework/src/test/java/polyall/quals/H1S1.java diff --git a/framework/tests/test-polyall/polyall/quals/H1S2.java b/framework/src/test/java/polyall/quals/H1S2.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1S2.java rename to framework/src/test/java/polyall/quals/H1S2.java diff --git a/framework/tests/test-polyall/polyall/quals/H1Top.java b/framework/src/test/java/polyall/quals/H1Top.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H1Top.java rename to framework/src/test/java/polyall/quals/H1Top.java diff --git a/framework/tests/test-polyall/polyall/quals/H2Bot.java b/framework/src/test/java/polyall/quals/H2Bot.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H2Bot.java rename to framework/src/test/java/polyall/quals/H2Bot.java diff --git a/framework/tests/test-polyall/polyall/quals/H2Poly.java b/framework/src/test/java/polyall/quals/H2Poly.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H2Poly.java rename to framework/src/test/java/polyall/quals/H2Poly.java diff --git a/framework/tests/test-polyall/polyall/quals/H2S1.java b/framework/src/test/java/polyall/quals/H2S1.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H2S1.java rename to framework/src/test/java/polyall/quals/H2S1.java diff --git a/framework/tests/test-polyall/polyall/quals/H2S2.java b/framework/src/test/java/polyall/quals/H2S2.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H2S2.java rename to framework/src/test/java/polyall/quals/H2S2.java diff --git a/framework/tests/test-polyall/polyall/quals/H2Top.java b/framework/src/test/java/polyall/quals/H2Top.java similarity index 100% rename from framework/tests/test-polyall/polyall/quals/H2Top.java rename to framework/src/test/java/polyall/quals/H2Top.java diff --git a/framework/tests/src/testlib/aggregate/AggregateOfCompoundChecker.java b/framework/src/test/java/testlib/aggregate/AggregateOfCompoundChecker.java similarity index 100% rename from framework/tests/src/testlib/aggregate/AggregateOfCompoundChecker.java rename to framework/src/test/java/testlib/aggregate/AggregateOfCompoundChecker.java diff --git a/framework/tests/src/testlib/aggregate/TestAggregateChecker.java b/framework/src/test/java/testlib/aggregate/TestAggregateChecker.java similarity index 100% rename from framework/tests/src/testlib/aggregate/TestAggregateChecker.java rename to framework/src/test/java/testlib/aggregate/TestAggregateChecker.java diff --git a/framework/tests/src/testlib/compound/AnotherCompoundChecker.java b/framework/src/test/java/testlib/compound/AnotherCompoundChecker.java similarity index 100% rename from framework/tests/src/testlib/compound/AnotherCompoundChecker.java rename to framework/src/test/java/testlib/compound/AnotherCompoundChecker.java diff --git a/framework/tests/src/testlib/compound/AnotherCompoundCheckerAnnotatedTypeFactory.java b/framework/src/test/java/testlib/compound/AnotherCompoundCheckerAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/compound/AnotherCompoundCheckerAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/compound/AnotherCompoundCheckerAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/compound/CompoundChecker.java b/framework/src/test/java/testlib/compound/CompoundChecker.java similarity index 100% rename from framework/tests/src/testlib/compound/CompoundChecker.java rename to framework/src/test/java/testlib/compound/CompoundChecker.java diff --git a/framework/tests/src/testlib/compound/CompoundCheckerAnnotatedTypeFactory.java b/framework/src/test/java/testlib/compound/CompoundCheckerAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/compound/CompoundCheckerAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/compound/CompoundCheckerAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/compound/qual/ACCBottom.java b/framework/src/test/java/testlib/compound/qual/ACCBottom.java similarity index 100% rename from framework/tests/src/testlib/compound/qual/ACCBottom.java rename to framework/src/test/java/testlib/compound/qual/ACCBottom.java diff --git a/framework/tests/src/testlib/compound/qual/ACCTop.java b/framework/src/test/java/testlib/compound/qual/ACCTop.java similarity index 100% rename from framework/tests/src/testlib/compound/qual/ACCTop.java rename to framework/src/test/java/testlib/compound/qual/ACCTop.java diff --git a/framework/tests/src/testlib/compound/qual/CCBottom.java b/framework/src/test/java/testlib/compound/qual/CCBottom.java similarity index 100% rename from framework/tests/src/testlib/compound/qual/CCBottom.java rename to framework/src/test/java/testlib/compound/qual/CCBottom.java diff --git a/framework/tests/src/testlib/compound/qual/CCTop.java b/framework/src/test/java/testlib/compound/qual/CCTop.java similarity index 100% rename from framework/tests/src/testlib/compound/qual/CCTop.java rename to framework/src/test/java/testlib/compound/qual/CCTop.java diff --git a/framework/tests/src/testlib/defaulting/DefaultingLowerBoundAnnotatedTypeFactory.java b/framework/src/test/java/testlib/defaulting/DefaultingLowerBoundAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/defaulting/DefaultingLowerBoundAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/defaulting/DefaultingLowerBoundAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/defaulting/DefaultingLowerBoundChecker.java b/framework/src/test/java/testlib/defaulting/DefaultingLowerBoundChecker.java similarity index 100% rename from framework/tests/src/testlib/defaulting/DefaultingLowerBoundChecker.java rename to framework/src/test/java/testlib/defaulting/DefaultingLowerBoundChecker.java diff --git a/framework/tests/src/testlib/defaulting/DefaultingUpperBoundAnnotatedTypeFactory.java b/framework/src/test/java/testlib/defaulting/DefaultingUpperBoundAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/defaulting/DefaultingUpperBoundAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/defaulting/DefaultingUpperBoundAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/defaulting/DefaultingUpperBoundChecker.java b/framework/src/test/java/testlib/defaulting/DefaultingUpperBoundChecker.java similarity index 100% rename from framework/tests/src/testlib/defaulting/DefaultingUpperBoundChecker.java rename to framework/src/test/java/testlib/defaulting/DefaultingUpperBoundChecker.java diff --git a/framework/tests/src/testlib/defaulting/LowerBoundQual.java b/framework/src/test/java/testlib/defaulting/LowerBoundQual.java similarity index 100% rename from framework/tests/src/testlib/defaulting/LowerBoundQual.java rename to framework/src/test/java/testlib/defaulting/LowerBoundQual.java diff --git a/framework/tests/src/testlib/defaulting/UpperBoundQual.java b/framework/src/test/java/testlib/defaulting/UpperBoundQual.java similarity index 100% rename from framework/tests/src/testlib/defaulting/UpperBoundQual.java rename to framework/src/test/java/testlib/defaulting/UpperBoundQual.java diff --git a/framework/tests/src/testlib/flowexpression/FlowExpressionAnnotatedTypeFactory.java b/framework/src/test/java/testlib/flowexpression/FlowExpressionAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/flowexpression/FlowExpressionAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/flowexpression/FlowExpressionAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/flowexpression/FlowExpressionChecker.java b/framework/src/test/java/testlib/flowexpression/FlowExpressionChecker.java similarity index 100% rename from framework/tests/src/testlib/flowexpression/FlowExpressionChecker.java rename to framework/src/test/java/testlib/flowexpression/FlowExpressionChecker.java diff --git a/framework/tests/src/testlib/flowexpression/qual/FEBot.java b/framework/src/test/java/testlib/flowexpression/qual/FEBot.java similarity index 100% rename from framework/tests/src/testlib/flowexpression/qual/FEBot.java rename to framework/src/test/java/testlib/flowexpression/qual/FEBot.java diff --git a/framework/tests/src/testlib/flowexpression/qual/FETop.java b/framework/src/test/java/testlib/flowexpression/qual/FETop.java similarity index 100% rename from framework/tests/src/testlib/flowexpression/qual/FETop.java rename to framework/src/test/java/testlib/flowexpression/qual/FETop.java diff --git a/framework/tests/src/testlib/flowexpression/qual/FlowExp.java b/framework/src/test/java/testlib/flowexpression/qual/FlowExp.java similarity index 100% rename from framework/tests/src/testlib/flowexpression/qual/FlowExp.java rename to framework/src/test/java/testlib/flowexpression/qual/FlowExp.java diff --git a/framework/tests/src/testlib/lib/README b/framework/src/test/java/testlib/lib/README similarity index 100% rename from framework/tests/src/testlib/lib/README rename to framework/src/test/java/testlib/lib/README diff --git a/framework/tests/src/testlib/lib/UncheckedByteCode.java b/framework/src/test/java/testlib/lib/UncheckedByteCode.java similarity index 100% rename from framework/tests/src/testlib/lib/UncheckedByteCode.java rename to framework/src/test/java/testlib/lib/UncheckedByteCode.java diff --git a/framework/tests/src/testlib/lib/VarArgMethods.java b/framework/src/test/java/testlib/lib/VarArgMethods.java similarity index 100% rename from framework/tests/src/testlib/lib/VarArgMethods.java rename to framework/src/test/java/testlib/lib/VarArgMethods.java diff --git a/framework/tests/src/testlib/nontopdefault/NTDAnnotatedTypeFactory.java b/framework/src/test/java/testlib/nontopdefault/NTDAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/NTDAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/nontopdefault/NTDAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/nontopdefault/NTDChecker.java b/framework/src/test/java/testlib/nontopdefault/NTDChecker.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/NTDChecker.java rename to framework/src/test/java/testlib/nontopdefault/NTDChecker.java diff --git a/framework/tests/src/testlib/nontopdefault/NTDVisitor.java b/framework/src/test/java/testlib/nontopdefault/NTDVisitor.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/NTDVisitor.java rename to framework/src/test/java/testlib/nontopdefault/NTDVisitor.java diff --git a/framework/tests/src/testlib/nontopdefault/qual/NTDBottom.java b/framework/src/test/java/testlib/nontopdefault/qual/NTDBottom.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/qual/NTDBottom.java rename to framework/src/test/java/testlib/nontopdefault/qual/NTDBottom.java diff --git a/framework/tests/src/testlib/nontopdefault/qual/NTDMiddle.java b/framework/src/test/java/testlib/nontopdefault/qual/NTDMiddle.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/qual/NTDMiddle.java rename to framework/src/test/java/testlib/nontopdefault/qual/NTDMiddle.java diff --git a/framework/tests/src/testlib/nontopdefault/qual/NTDSide.java b/framework/src/test/java/testlib/nontopdefault/qual/NTDSide.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/qual/NTDSide.java rename to framework/src/test/java/testlib/nontopdefault/qual/NTDSide.java diff --git a/framework/tests/src/testlib/nontopdefault/qual/NTDTop.java b/framework/src/test/java/testlib/nontopdefault/qual/NTDTop.java similarity index 100% rename from framework/tests/src/testlib/nontopdefault/qual/NTDTop.java rename to framework/src/test/java/testlib/nontopdefault/qual/NTDTop.java diff --git a/framework/tests/src/testlib/reflection/ReflectionTestAnnotatedTypeFactory.java b/framework/src/test/java/testlib/reflection/ReflectionTestAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/reflection/ReflectionTestAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/reflection/ReflectionTestAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/reflection/ReflectionTestChecker.java b/framework/src/test/java/testlib/reflection/ReflectionTestChecker.java similarity index 100% rename from framework/tests/src/testlib/reflection/ReflectionTestChecker.java rename to framework/src/test/java/testlib/reflection/ReflectionTestChecker.java diff --git a/framework/tests/src/testlib/reflection/ReflectionTestVisitor.java b/framework/src/test/java/testlib/reflection/ReflectionTestVisitor.java similarity index 100% rename from framework/tests/src/testlib/reflection/ReflectionTestVisitor.java rename to framework/src/test/java/testlib/reflection/ReflectionTestVisitor.java diff --git a/framework/tests/src/testlib/reflection/qual/PolyReflection.java b/framework/src/test/java/testlib/reflection/qual/PolyReflection.java similarity index 100% rename from framework/tests/src/testlib/reflection/qual/PolyReflection.java rename to framework/src/test/java/testlib/reflection/qual/PolyReflection.java diff --git a/framework/tests/src/testlib/reflection/qual/ReflectBottom.java b/framework/src/test/java/testlib/reflection/qual/ReflectBottom.java similarity index 100% rename from framework/tests/src/testlib/reflection/qual/ReflectBottom.java rename to framework/src/test/java/testlib/reflection/qual/ReflectBottom.java diff --git a/framework/tests/src/testlib/reflection/qual/Sibling1.java b/framework/src/test/java/testlib/reflection/qual/Sibling1.java similarity index 100% rename from framework/tests/src/testlib/reflection/qual/Sibling1.java rename to framework/src/test/java/testlib/reflection/qual/Sibling1.java diff --git a/framework/tests/src/testlib/reflection/qual/Sibling2.java b/framework/src/test/java/testlib/reflection/qual/Sibling2.java similarity index 100% rename from framework/tests/src/testlib/reflection/qual/Sibling2.java rename to framework/src/test/java/testlib/reflection/qual/Sibling2.java diff --git a/framework/tests/src/testlib/reflection/qual/Top.java b/framework/src/test/java/testlib/reflection/qual/Top.java similarity index 100% rename from framework/tests/src/testlib/reflection/qual/Top.java rename to framework/src/test/java/testlib/reflection/qual/Top.java diff --git a/framework/tests/src/testlib/supportedquals/SupportedQualsChecker.java b/framework/src/test/java/testlib/supportedquals/SupportedQualsChecker.java similarity index 100% rename from framework/tests/src/testlib/supportedquals/SupportedQualsChecker.java rename to framework/src/test/java/testlib/supportedquals/SupportedQualsChecker.java diff --git a/framework/tests/src/testlib/supportedquals/qual/BottomQualifier.java b/framework/src/test/java/testlib/supportedquals/qual/BottomQualifier.java similarity index 100% rename from framework/tests/src/testlib/supportedquals/qual/BottomQualifier.java rename to framework/src/test/java/testlib/supportedquals/qual/BottomQualifier.java diff --git a/framework/tests/src/testlib/supportedquals/qual/NotQualifier.java b/framework/src/test/java/testlib/supportedquals/qual/NotQualifier.java similarity index 100% rename from framework/tests/src/testlib/supportedquals/qual/NotQualifier.java rename to framework/src/test/java/testlib/supportedquals/qual/NotQualifier.java diff --git a/framework/tests/src/testlib/supportedquals/qual/Qualifier.java b/framework/src/test/java/testlib/supportedquals/qual/Qualifier.java similarity index 100% rename from framework/tests/src/testlib/supportedquals/qual/Qualifier.java rename to framework/src/test/java/testlib/supportedquals/qual/Qualifier.java diff --git a/framework/tests/src/testlib/util/AnnoWithStringArg.java b/framework/src/test/java/testlib/util/AnnoWithStringArg.java similarity index 100% rename from framework/tests/src/testlib/util/AnnoWithStringArg.java rename to framework/src/test/java/testlib/util/AnnoWithStringArg.java diff --git a/framework/tests/src/testlib/util/Critical.java b/framework/src/test/java/testlib/util/Critical.java similarity index 100% rename from framework/tests/src/testlib/util/Critical.java rename to framework/src/test/java/testlib/util/Critical.java diff --git a/framework/tests/src/testlib/util/Encrypted.java b/framework/src/test/java/testlib/util/Encrypted.java similarity index 100% rename from framework/tests/src/testlib/util/Encrypted.java rename to framework/src/test/java/testlib/util/Encrypted.java diff --git a/framework/tests/src/testlib/util/EnsuresOdd.java b/framework/src/test/java/testlib/util/EnsuresOdd.java similarity index 100% rename from framework/tests/src/testlib/util/EnsuresOdd.java rename to framework/src/test/java/testlib/util/EnsuresOdd.java diff --git a/framework/tests/src/testlib/util/EnsuresOddIf.java b/framework/src/test/java/testlib/util/EnsuresOddIf.java similarity index 100% rename from framework/tests/src/testlib/util/EnsuresOddIf.java rename to framework/src/test/java/testlib/util/EnsuresOddIf.java diff --git a/framework/tests/src/testlib/util/Even.java b/framework/src/test/java/testlib/util/Even.java similarity index 100% rename from framework/tests/src/testlib/util/Even.java rename to framework/src/test/java/testlib/util/Even.java diff --git a/framework/tests/src/testlib/util/FactoryTestChecker.java b/framework/src/test/java/testlib/util/FactoryTestChecker.java similarity index 100% rename from framework/tests/src/testlib/util/FactoryTestChecker.java rename to framework/src/test/java/testlib/util/FactoryTestChecker.java diff --git a/framework/tests/src/testlib/util/FlowTestAnnotatedTypeFactory.java b/framework/src/test/java/testlib/util/FlowTestAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/util/FlowTestAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/util/FlowTestAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/util/FlowTestChecker.java b/framework/src/test/java/testlib/util/FlowTestChecker.java similarity index 100% rename from framework/tests/src/testlib/util/FlowTestChecker.java rename to framework/src/test/java/testlib/util/FlowTestChecker.java diff --git a/framework/tests/src/testlib/util/MonotonicOdd.java b/framework/src/test/java/testlib/util/MonotonicOdd.java similarity index 100% rename from framework/tests/src/testlib/util/MonotonicOdd.java rename to framework/src/test/java/testlib/util/MonotonicOdd.java diff --git a/framework/tests/src/testlib/util/Odd.java b/framework/src/test/java/testlib/util/Odd.java similarity index 100% rename from framework/tests/src/testlib/util/Odd.java rename to framework/src/test/java/testlib/util/Odd.java diff --git a/framework/tests/src/testlib/util/PatternA.java b/framework/src/test/java/testlib/util/PatternA.java similarity index 100% rename from framework/tests/src/testlib/util/PatternA.java rename to framework/src/test/java/testlib/util/PatternA.java diff --git a/framework/tests/src/testlib/util/PatternAB.java b/framework/src/test/java/testlib/util/PatternAB.java similarity index 100% rename from framework/tests/src/testlib/util/PatternAB.java rename to framework/src/test/java/testlib/util/PatternAB.java diff --git a/framework/tests/src/testlib/util/PatternAC.java b/framework/src/test/java/testlib/util/PatternAC.java similarity index 100% rename from framework/tests/src/testlib/util/PatternAC.java rename to framework/src/test/java/testlib/util/PatternAC.java diff --git a/framework/tests/src/testlib/util/PatternB.java b/framework/src/test/java/testlib/util/PatternB.java similarity index 100% rename from framework/tests/src/testlib/util/PatternB.java rename to framework/src/test/java/testlib/util/PatternB.java diff --git a/framework/tests/src/testlib/util/PatternBC.java b/framework/src/test/java/testlib/util/PatternBC.java similarity index 100% rename from framework/tests/src/testlib/util/PatternBC.java rename to framework/src/test/java/testlib/util/PatternBC.java diff --git a/framework/tests/src/testlib/util/PatternBottomFull.java b/framework/src/test/java/testlib/util/PatternBottomFull.java similarity index 100% rename from framework/tests/src/testlib/util/PatternBottomFull.java rename to framework/src/test/java/testlib/util/PatternBottomFull.java diff --git a/framework/tests/src/testlib/util/PatternBottomPartial.java b/framework/src/test/java/testlib/util/PatternBottomPartial.java similarity index 100% rename from framework/tests/src/testlib/util/PatternBottomPartial.java rename to framework/src/test/java/testlib/util/PatternBottomPartial.java diff --git a/framework/tests/src/testlib/util/PatternC.java b/framework/src/test/java/testlib/util/PatternC.java similarity index 100% rename from framework/tests/src/testlib/util/PatternC.java rename to framework/src/test/java/testlib/util/PatternC.java diff --git a/framework/tests/src/testlib/util/PatternUnknown.java b/framework/src/test/java/testlib/util/PatternUnknown.java similarity index 100% rename from framework/tests/src/testlib/util/PatternUnknown.java rename to framework/src/test/java/testlib/util/PatternUnknown.java diff --git a/framework/tests/src/testlib/util/PolyEncrypted.java b/framework/src/test/java/testlib/util/PolyEncrypted.java similarity index 100% rename from framework/tests/src/testlib/util/PolyEncrypted.java rename to framework/src/test/java/testlib/util/PolyEncrypted.java diff --git a/framework/tests/src/testlib/util/RequiresOdd.java b/framework/src/test/java/testlib/util/RequiresOdd.java similarity index 100% rename from framework/tests/src/testlib/util/RequiresOdd.java rename to framework/src/test/java/testlib/util/RequiresOdd.java diff --git a/framework/tests/src/testlib/util/SubQual.java b/framework/src/test/java/testlib/util/SubQual.java similarity index 100% rename from framework/tests/src/testlib/util/SubQual.java rename to framework/src/test/java/testlib/util/SubQual.java diff --git a/framework/tests/src/testlib/util/SuperQual.java b/framework/src/test/java/testlib/util/SuperQual.java similarity index 100% rename from framework/tests/src/testlib/util/SuperQual.java rename to framework/src/test/java/testlib/util/SuperQual.java diff --git a/framework/tests/src/testlib/util/TestChecker.java b/framework/src/test/java/testlib/util/TestChecker.java similarity index 100% rename from framework/tests/src/testlib/util/TestChecker.java rename to framework/src/test/java/testlib/util/TestChecker.java diff --git a/framework/tests/src/testlib/util/Value.java b/framework/src/test/java/testlib/util/Value.java similarity index 100% rename from framework/tests/src/testlib/util/Value.java rename to framework/src/test/java/testlib/util/Value.java diff --git a/framework/tests/src/testlib/util/package-info.java b/framework/src/test/java/testlib/util/package-info.java similarity index 100% rename from framework/tests/src/testlib/util/package-info.java rename to framework/src/test/java/testlib/util/package-info.java diff --git a/framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestAnnotatedTypeFactory.java b/framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestAnnotatedTypeFactory.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestAnnotatedTypeFactory.java rename to framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestAnnotatedTypeFactory.java diff --git a/framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestChecker.java b/framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestChecker.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestChecker.java rename to framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestChecker.java diff --git a/framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestVisitor.java b/framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestVisitor.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/WholeProgramInferenceTestVisitor.java rename to framework/src/test/java/testlib/wholeprograminference/WholeProgramInferenceTestVisitor.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/DefaultType.java b/framework/src/test/java/testlib/wholeprograminference/qual/DefaultType.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/DefaultType.java rename to framework/src/test/java/testlib/wholeprograminference/qual/DefaultType.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/ImplicitAnno.java b/framework/src/test/java/testlib/wholeprograminference/qual/ImplicitAnno.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/ImplicitAnno.java rename to framework/src/test/java/testlib/wholeprograminference/qual/ImplicitAnno.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/Parent.java b/framework/src/test/java/testlib/wholeprograminference/qual/Parent.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/Parent.java rename to framework/src/test/java/testlib/wholeprograminference/qual/Parent.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/Sibling1.java b/framework/src/test/java/testlib/wholeprograminference/qual/Sibling1.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/Sibling1.java rename to framework/src/test/java/testlib/wholeprograminference/qual/Sibling1.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/Sibling2.java b/framework/src/test/java/testlib/wholeprograminference/qual/Sibling2.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/Sibling2.java rename to framework/src/test/java/testlib/wholeprograminference/qual/Sibling2.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/SiblingWithFields.java b/framework/src/test/java/testlib/wholeprograminference/qual/SiblingWithFields.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/SiblingWithFields.java rename to framework/src/test/java/testlib/wholeprograminference/qual/SiblingWithFields.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/ToIgnore.java b/framework/src/test/java/testlib/wholeprograminference/qual/ToIgnore.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/ToIgnore.java rename to framework/src/test/java/testlib/wholeprograminference/qual/ToIgnore.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/Top.java b/framework/src/test/java/testlib/wholeprograminference/qual/Top.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/Top.java rename to framework/src/test/java/testlib/wholeprograminference/qual/Top.java diff --git a/framework/tests/src/testlib/wholeprograminference/qual/WholeProgramInferenceBottom.java b/framework/src/test/java/testlib/wholeprograminference/qual/WholeProgramInferenceBottom.java similarity index 100% rename from framework/tests/src/testlib/wholeprograminference/qual/WholeProgramInferenceBottom.java rename to framework/src/test/java/testlib/wholeprograminference/qual/WholeProgramInferenceBottom.java diff --git a/framework/tests/src/tests/AggregateTest.java b/framework/src/test/java/tests/AggregateTest.java similarity index 100% rename from framework/tests/src/tests/AggregateTest.java rename to framework/src/test/java/tests/AggregateTest.java diff --git a/framework/tests/src/tests/AliasingTest.java b/framework/src/test/java/tests/AliasingTest.java similarity index 100% rename from framework/tests/src/tests/AliasingTest.java rename to framework/src/test/java/tests/AliasingTest.java diff --git a/framework/tests/src/tests/AnnotatedForTest.java b/framework/src/test/java/tests/AnnotatedForTest.java similarity index 100% rename from framework/tests/src/tests/AnnotatedForTest.java rename to framework/src/test/java/tests/AnnotatedForTest.java diff --git a/framework/tests/src/tests/AnnotationBuilderTest.java b/framework/src/test/java/tests/AnnotationBuilderTest.java similarity index 100% rename from framework/tests/src/tests/AnnotationBuilderTest.java rename to framework/src/test/java/tests/AnnotationBuilderTest.java diff --git a/framework/tests/src/tests/ClassValTest.java b/framework/src/test/java/tests/ClassValTest.java similarity index 100% rename from framework/tests/src/tests/ClassValTest.java rename to framework/src/test/java/tests/ClassValTest.java diff --git a/framework/tests/src/tests/CompoundCheckerTest.java b/framework/src/test/java/tests/CompoundCheckerTest.java similarity index 100% rename from framework/tests/src/tests/CompoundCheckerTest.java rename to framework/src/test/java/tests/CompoundCheckerTest.java diff --git a/framework/tests/src/tests/DefaultingLowerBoundTest.java b/framework/src/test/java/tests/DefaultingLowerBoundTest.java similarity index 100% rename from framework/tests/src/tests/DefaultingLowerBoundTest.java rename to framework/src/test/java/tests/DefaultingLowerBoundTest.java diff --git a/framework/tests/src/tests/DefaultingUpperBoundTest.java b/framework/src/test/java/tests/DefaultingUpperBoundTest.java similarity index 100% rename from framework/tests/src/tests/DefaultingUpperBoundTest.java rename to framework/src/test/java/tests/DefaultingUpperBoundTest.java diff --git a/framework/tests/src/tests/Flow2Test.java b/framework/src/test/java/tests/Flow2Test.java similarity index 100% rename from framework/tests/src/tests/Flow2Test.java rename to framework/src/test/java/tests/Flow2Test.java diff --git a/framework/tests/src/tests/FlowExpressionCheckerTest.java b/framework/src/test/java/tests/FlowExpressionCheckerTest.java similarity index 100% rename from framework/tests/src/tests/FlowExpressionCheckerTest.java rename to framework/src/test/java/tests/FlowExpressionCheckerTest.java diff --git a/framework/tests/src/tests/FlowTest.java b/framework/src/test/java/tests/FlowTest.java similarity index 100% rename from framework/tests/src/tests/FlowTest.java rename to framework/src/test/java/tests/FlowTest.java diff --git a/framework/tests/src/tests/FrameworkTest.java b/framework/src/test/java/tests/FrameworkTest.java similarity index 100% rename from framework/tests/src/tests/FrameworkTest.java rename to framework/src/test/java/tests/FrameworkTest.java diff --git a/framework/tests/src/tests/LubGlbTest.java b/framework/src/test/java/tests/LubGlbTest.java similarity index 100% rename from framework/tests/src/tests/LubGlbTest.java rename to framework/src/test/java/tests/LubGlbTest.java diff --git a/framework/tests/src/tests/MethodValTest.java b/framework/src/test/java/tests/MethodValTest.java similarity index 100% rename from framework/tests/src/tests/MethodValTest.java rename to framework/src/test/java/tests/MethodValTest.java diff --git a/framework/tests/src/tests/NonTopDefaultTest.java b/framework/src/test/java/tests/NonTopDefaultTest.java similarity index 100% rename from framework/tests/src/tests/NonTopDefaultTest.java rename to framework/src/test/java/tests/NonTopDefaultTest.java diff --git a/framework/tests/src/tests/PolyAllTest.java b/framework/src/test/java/tests/PolyAllTest.java similarity index 100% rename from framework/tests/src/tests/PolyAllTest.java rename to framework/src/test/java/tests/PolyAllTest.java diff --git a/framework/tests/src/tests/PuritySuggestionsTest.java b/framework/src/test/java/tests/PuritySuggestionsTest.java similarity index 100% rename from framework/tests/src/tests/PuritySuggestionsTest.java rename to framework/src/test/java/tests/PuritySuggestionsTest.java diff --git a/framework/tests/src/tests/RangeTest.java b/framework/src/test/java/tests/RangeTest.java similarity index 100% rename from framework/tests/src/tests/RangeTest.java rename to framework/src/test/java/tests/RangeTest.java diff --git a/framework/tests/src/tests/ReflectionTest.java b/framework/src/test/java/tests/ReflectionTest.java similarity index 100% rename from framework/tests/src/tests/ReflectionTest.java rename to framework/src/test/java/tests/ReflectionTest.java diff --git a/framework/tests/src/tests/ReportModifiersTest.java b/framework/src/test/java/tests/ReportModifiersTest.java similarity index 100% rename from framework/tests/src/tests/ReportModifiersTest.java rename to framework/src/test/java/tests/ReportModifiersTest.java diff --git a/framework/tests/src/tests/ReportTest.java b/framework/src/test/java/tests/ReportTest.java similarity index 100% rename from framework/tests/src/tests/ReportTest.java rename to framework/src/test/java/tests/ReportTest.java diff --git a/framework/tests/src/tests/ReportTreeKindsTest.java b/framework/src/test/java/tests/ReportTreeKindsTest.java similarity index 100% rename from framework/tests/src/tests/ReportTreeKindsTest.java rename to framework/src/test/java/tests/ReportTreeKindsTest.java diff --git a/framework/tests/src/tests/SubtypingEncryptedTest.java b/framework/src/test/java/tests/SubtypingEncryptedTest.java similarity index 100% rename from framework/tests/src/tests/SubtypingEncryptedTest.java rename to framework/src/test/java/tests/SubtypingEncryptedTest.java diff --git a/framework/tests/src/tests/SubtypingStringPatternsFullTest.java b/framework/src/test/java/tests/SubtypingStringPatternsFullTest.java similarity index 100% rename from framework/tests/src/tests/SubtypingStringPatternsFullTest.java rename to framework/src/test/java/tests/SubtypingStringPatternsFullTest.java diff --git a/framework/tests/src/tests/SubtypingStringPatternsPartialTest.java b/framework/src/test/java/tests/SubtypingStringPatternsPartialTest.java similarity index 100% rename from framework/tests/src/tests/SubtypingStringPatternsPartialTest.java rename to framework/src/test/java/tests/SubtypingStringPatternsPartialTest.java diff --git a/framework/tests/src/tests/SupportedQualsTest.java b/framework/src/test/java/tests/SupportedQualsTest.java similarity index 100% rename from framework/tests/src/tests/SupportedQualsTest.java rename to framework/src/test/java/tests/SupportedQualsTest.java diff --git a/framework/tests/src/tests/TreeParserTest.java b/framework/src/test/java/tests/TreeParserTest.java similarity index 100% rename from framework/tests/src/tests/TreeParserTest.java rename to framework/src/test/java/tests/TreeParserTest.java diff --git a/framework/tests/src/tests/ValueIgnoreRangeOverflowTest.java b/framework/src/test/java/tests/ValueIgnoreRangeOverflowTest.java similarity index 100% rename from framework/tests/src/tests/ValueIgnoreRangeOverflowTest.java rename to framework/src/test/java/tests/ValueIgnoreRangeOverflowTest.java diff --git a/framework/tests/src/tests/ValueTest.java b/framework/src/test/java/tests/ValueTest.java similarity index 100% rename from framework/tests/src/tests/ValueTest.java rename to framework/src/test/java/tests/ValueTest.java diff --git a/framework/tests/src/tests/ValueUncheckedDefaultsTest.java b/framework/src/test/java/tests/ValueUncheckedDefaultsTest.java similarity index 100% rename from framework/tests/src/tests/ValueUncheckedDefaultsTest.java rename to framework/src/test/java/tests/ValueUncheckedDefaultsTest.java diff --git a/framework/tests/src/tests/WholeProgramInferenceTest.java b/framework/src/test/java/tests/WholeProgramInferenceTest.java similarity index 100% rename from framework/tests/src/tests/WholeProgramInferenceTest.java rename to framework/src/test/java/tests/WholeProgramInferenceTest.java diff --git a/framework/tests/src/tests/WholeProgramInferenceValidationTest.java b/framework/src/test/java/tests/WholeProgramInferenceValidationTest.java similarity index 100% rename from framework/tests/src/tests/WholeProgramInferenceValidationTest.java rename to framework/src/test/java/tests/WholeProgramInferenceValidationTest.java diff --git a/framework/tests/src/testannotations/android/support/annotation/IntRange.java b/framework/src/testannotations/java/android/support/annotation/IntRange.java similarity index 100% rename from framework/tests/src/testannotations/android/support/annotation/IntRange.java rename to framework/src/testannotations/java/android/support/annotation/IntRange.java diff --git a/javacutil/.classpath b/javacutil/.classpath index ee45f2c68d6..2a643aab05d 100644 --- a/javacutil/.classpath +++ b/javacutil/.classpath @@ -1,8 +1,31 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/javacutil/.project b/javacutil/.project index 11e495635b8..ecce9ead5a2 100644 --- a/javacutil/.project +++ b/javacutil/.project @@ -10,8 +10,14 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature diff --git a/javacutil/build.gradle b/javacutil/build.gradle index 3ef29663e5f..ad2413c730b 100644 --- a/javacutil/build.gradle +++ b/javacutil/build.gradle @@ -2,27 +2,7 @@ repositories { mavenCentral() } -sourceSets { - main { - java { - srcDirs = ['src'] - // Exclude the ManualTaglet - exclude '**/javacutil/dist/**' - } - } - - // Source set for the ManualTaglet - taglet { - java { - srcDirs = ['src'] - include '**/javacutil/dist/**' - } - } -} - dependencies { compile configurations.javacJar compileOnly project(':checker-qual') - - tagletCompile configurations.toolsJar } diff --git a/javacutil/src/org/checkerframework/javacutil/AbstractTypeProcessor.java b/javacutil/src/main/java/org/checkerframework/javacutil/AbstractTypeProcessor.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/AbstractTypeProcessor.java rename to javacutil/src/main/java/org/checkerframework/javacutil/AbstractTypeProcessor.java diff --git a/javacutil/src/org/checkerframework/javacutil/AnnotationBuilder.java b/javacutil/src/main/java/org/checkerframework/javacutil/AnnotationBuilder.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/AnnotationBuilder.java rename to javacutil/src/main/java/org/checkerframework/javacutil/AnnotationBuilder.java diff --git a/javacutil/src/org/checkerframework/javacutil/AnnotationProvider.java b/javacutil/src/main/java/org/checkerframework/javacutil/AnnotationProvider.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/AnnotationProvider.java rename to javacutil/src/main/java/org/checkerframework/javacutil/AnnotationProvider.java diff --git a/javacutil/src/org/checkerframework/javacutil/AnnotationUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/AnnotationUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/AnnotationUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/AnnotationUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/BasicAnnotationProvider.java b/javacutil/src/main/java/org/checkerframework/javacutil/BasicAnnotationProvider.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/BasicAnnotationProvider.java rename to javacutil/src/main/java/org/checkerframework/javacutil/BasicAnnotationProvider.java diff --git a/javacutil/src/org/checkerframework/javacutil/BasicTypeProcessor.java b/javacutil/src/main/java/org/checkerframework/javacutil/BasicTypeProcessor.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/BasicTypeProcessor.java rename to javacutil/src/main/java/org/checkerframework/javacutil/BasicTypeProcessor.java diff --git a/javacutil/src/org/checkerframework/javacutil/CollectionUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/CollectionUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/CollectionUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/CollectionUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/ElementUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/ElementUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/ElementUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/ErrorHandler.java b/javacutil/src/main/java/org/checkerframework/javacutil/ErrorHandler.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/ErrorHandler.java rename to javacutil/src/main/java/org/checkerframework/javacutil/ErrorHandler.java diff --git a/javacutil/src/org/checkerframework/javacutil/ErrorReporter.java b/javacutil/src/main/java/org/checkerframework/javacutil/ErrorReporter.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/ErrorReporter.java rename to javacutil/src/main/java/org/checkerframework/javacutil/ErrorReporter.java diff --git a/javacutil/src/org/checkerframework/javacutil/InternalUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/InternalUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/InternalUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/InternalUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/Pair.java b/javacutil/src/main/java/org/checkerframework/javacutil/Pair.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/Pair.java rename to javacutil/src/main/java/org/checkerframework/javacutil/Pair.java diff --git a/framework/src/org/checkerframework/framework/util/PluginUtil.java b/javacutil/src/main/java/org/checkerframework/javacutil/PluginUtil.java similarity index 99% rename from framework/src/org/checkerframework/framework/util/PluginUtil.java rename to javacutil/src/main/java/org/checkerframework/javacutil/PluginUtil.java index f613974aee0..c3ea87a2f0f 100644 --- a/framework/src/org/checkerframework/framework/util/PluginUtil.java +++ b/javacutil/src/main/java/org/checkerframework/javacutil/PluginUtil.java @@ -1,4 +1,4 @@ -package org.checkerframework.framework.util; +package org.checkerframework.javacutil; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/javacutil/src/org/checkerframework/javacutil/Resolver.java b/javacutil/src/main/java/org/checkerframework/javacutil/Resolver.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/Resolver.java rename to javacutil/src/main/java/org/checkerframework/javacutil/Resolver.java diff --git a/javacutil/src/org/checkerframework/javacutil/TreeUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/TreeUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/TreeUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/TreeUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/TypeAnnotationUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/TypeAnnotationUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/TypeAnnotationUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/TypeAnnotationUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/TypesUtils.java b/javacutil/src/main/java/org/checkerframework/javacutil/TypesUtils.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/TypesUtils.java rename to javacutil/src/main/java/org/checkerframework/javacutil/TypesUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/trees/DetachedVarSymbol.java b/javacutil/src/main/java/org/checkerframework/javacutil/trees/DetachedVarSymbol.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/trees/DetachedVarSymbol.java rename to javacutil/src/main/java/org/checkerframework/javacutil/trees/DetachedVarSymbol.java diff --git a/javacutil/src/org/checkerframework/javacutil/trees/TreeBuilder.java b/javacutil/src/main/java/org/checkerframework/javacutil/trees/TreeBuilder.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/trees/TreeBuilder.java rename to javacutil/src/main/java/org/checkerframework/javacutil/trees/TreeBuilder.java diff --git a/javacutil/src/org/checkerframework/javacutil/trees/TreeParser.java b/javacutil/src/main/java/org/checkerframework/javacutil/trees/TreeParser.java similarity index 100% rename from javacutil/src/org/checkerframework/javacutil/trees/TreeParser.java rename to javacutil/src/main/java/org/checkerframework/javacutil/trees/TreeParser.java diff --git a/jdk8/build.gradle b/jdk8/build.gradle index 96c9b512026..b98f792abc1 100644 --- a/jdk8/build.gradle +++ b/jdk8/build.gradle @@ -32,12 +32,11 @@ task downloadJdk() { task buildJdk(type: Jar, group: 'Build') { description 'Builds jdk8.jar' dependsOn(':checker:copyJarsToDist') - dependsOn(':javacutil:tagletClasses') - if (System.getenv('JAVA_HOME') == null) { - throw new GradleException("Environment variable JAVA_HOME is not set.") - } doLast { + if (System.getenv('JAVA_HOME') == null) { + throw new GradleException("Environment variable JAVA_HOME is not set.") + } exec { executable 'make' environment CHECKERFRAMEWORK: "${projectDir}/..", diff --git a/settings.gradle b/settings.gradle index dfb163e5fa5..f58828933c6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,3 +5,5 @@ include 'dataflow' include 'framework' include 'checker-qual' include 'jdk8' +include 'util' + diff --git a/util/build.gradle b/util/build.gradle new file mode 100644 index 00000000000..43a39390dfe --- /dev/null +++ b/util/build.gradle @@ -0,0 +1,10 @@ +sourceSets { + taglet +} + +dependencies { + compile group: 'junit', name: 'junit', version: '4.12' + compile project(':javacutil') + + tagletCompile configurations.toolsJar +} diff --git a/framework/src/org/checkerframework/framework/test/CheckerFrameworkPerDirectoryTest.java b/util/src/main/java/org/checkerframework/framework/test/CheckerFrameworkPerDirectoryTest.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/CheckerFrameworkPerDirectoryTest.java rename to util/src/main/java/org/checkerframework/framework/test/CheckerFrameworkPerDirectoryTest.java diff --git a/framework/src/org/checkerframework/framework/test/CheckerFrameworkPerFileTest.java b/util/src/main/java/org/checkerframework/framework/test/CheckerFrameworkPerFileTest.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/CheckerFrameworkPerFileTest.java rename to util/src/main/java/org/checkerframework/framework/test/CheckerFrameworkPerFileTest.java diff --git a/framework/src/org/checkerframework/framework/test/CompilationResult.java b/util/src/main/java/org/checkerframework/framework/test/CompilationResult.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/CompilationResult.java rename to util/src/main/java/org/checkerframework/framework/test/CompilationResult.java diff --git a/framework/src/org/checkerframework/framework/test/FrameworkPerDirectoryTest.java b/util/src/main/java/org/checkerframework/framework/test/FrameworkPerDirectoryTest.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/FrameworkPerDirectoryTest.java rename to util/src/main/java/org/checkerframework/framework/test/FrameworkPerDirectoryTest.java diff --git a/framework/src/org/checkerframework/framework/test/FrameworkPerFileTest.java b/util/src/main/java/org/checkerframework/framework/test/FrameworkPerFileTest.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/FrameworkPerFileTest.java rename to util/src/main/java/org/checkerframework/framework/test/FrameworkPerFileTest.java diff --git a/framework/src/org/checkerframework/framework/test/ImmutableTestConfiguration.java b/util/src/main/java/org/checkerframework/framework/test/ImmutableTestConfiguration.java similarity index 98% rename from framework/src/org/checkerframework/framework/test/ImmutableTestConfiguration.java rename to util/src/main/java/org/checkerframework/framework/test/ImmutableTestConfiguration.java index 9dd87e75508..c78202d75b0 100644 --- a/framework/src/org/checkerframework/framework/test/ImmutableTestConfiguration.java +++ b/util/src/main/java/org/checkerframework/framework/test/ImmutableTestConfiguration.java @@ -6,7 +6,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * Represents all of the information needed to execute the Javac compiler for a given set of test diff --git a/framework/src/org/checkerframework/framework/test/PerDirectorySuite.java b/util/src/main/java/org/checkerframework/framework/test/PerDirectorySuite.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/PerDirectorySuite.java rename to util/src/main/java/org/checkerframework/framework/test/PerDirectorySuite.java diff --git a/framework/src/org/checkerframework/framework/test/PerFileSuite.java b/util/src/main/java/org/checkerframework/framework/test/PerFileSuite.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/PerFileSuite.java rename to util/src/main/java/org/checkerframework/framework/test/PerFileSuite.java diff --git a/framework/src/org/checkerframework/framework/test/SimpleOptionMap.java b/util/src/main/java/org/checkerframework/framework/test/SimpleOptionMap.java similarity index 98% rename from framework/src/org/checkerframework/framework/test/SimpleOptionMap.java rename to util/src/main/java/org/checkerframework/framework/test/SimpleOptionMap.java index 0d68c93fe25..f2ba419e7d9 100644 --- a/framework/src/org/checkerframework/framework/test/SimpleOptionMap.java +++ b/util/src/main/java/org/checkerframework/framework/test/SimpleOptionMap.java @@ -5,7 +5,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * SimpleOptionMap is a very basic Option container. The keys of the Option container are the set of diff --git a/framework/src/org/checkerframework/framework/test/TestConfiguration.java b/util/src/main/java/org/checkerframework/framework/test/TestConfiguration.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/TestConfiguration.java rename to util/src/main/java/org/checkerframework/framework/test/TestConfiguration.java diff --git a/framework/src/org/checkerframework/framework/test/TestConfigurationBuilder.java b/util/src/main/java/org/checkerframework/framework/test/TestConfigurationBuilder.java similarity index 99% rename from framework/src/org/checkerframework/framework/test/TestConfigurationBuilder.java rename to util/src/main/java/org/checkerframework/framework/test/TestConfigurationBuilder.java index cd68544b552..dbf633a9c57 100644 --- a/framework/src/org/checkerframework/framework/test/TestConfigurationBuilder.java +++ b/util/src/main/java/org/checkerframework/framework/test/TestConfigurationBuilder.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** * Used to create an instance of TestConfiguration, TestConfigurationBuilder follows the standard diff --git a/framework/src/org/checkerframework/framework/test/TestUtilities.java b/util/src/main/java/org/checkerframework/framework/test/TestUtilities.java similarity index 98% rename from framework/src/org/checkerframework/framework/test/TestUtilities.java rename to util/src/main/java/org/checkerframework/framework/test/TestUtilities.java index 7f3eac55460..fe5b8a9bcb8 100644 --- a/framework/src/org/checkerframework/framework/test/TestUtilities.java +++ b/util/src/main/java/org/checkerframework/framework/test/TestUtilities.java @@ -21,7 +21,7 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.ToolProvider; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; import org.junit.Assert; public class TestUtilities { @@ -32,7 +32,7 @@ public class TestUtilities { JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); OutputStream err = new ByteArrayOutputStream(); compiler.run(null, null, err, "-version"); - isAtLeast9Jvm = org.checkerframework.framework.util.PluginUtil.getJreVersion() >= 1.9d; + isAtLeast9Jvm = PluginUtil.getJreVersion() >= 1.9d; } public static List findNestedJavaTestFiles(String... dirNames) { diff --git a/framework/src/org/checkerframework/framework/test/TypecheckExecutor.java b/util/src/main/java/org/checkerframework/framework/test/TypecheckExecutor.java similarity index 98% rename from framework/src/org/checkerframework/framework/test/TypecheckExecutor.java rename to util/src/main/java/org/checkerframework/framework/test/TypecheckExecutor.java index db7f0c622c6..b607dd0e783 100644 --- a/framework/src/org/checkerframework/framework/test/TypecheckExecutor.java +++ b/util/src/main/java/org/checkerframework/framework/test/TypecheckExecutor.java @@ -11,7 +11,7 @@ import javax.tools.ToolProvider; import org.checkerframework.framework.test.diagnostics.JavaDiagnosticReader; import org.checkerframework.framework.test.diagnostics.TestDiagnostic; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** Used by the Checker Framework test suite to run the framework and generate a test result. */ public class TypecheckExecutor { diff --git a/framework/src/org/checkerframework/framework/test/TypecheckResult.java b/util/src/main/java/org/checkerframework/framework/test/TypecheckResult.java similarity index 99% rename from framework/src/org/checkerframework/framework/test/TypecheckResult.java rename to util/src/main/java/org/checkerframework/framework/test/TypecheckResult.java index 4235f403448..67775e6d62e 100644 --- a/framework/src/org/checkerframework/framework/test/TypecheckResult.java +++ b/util/src/main/java/org/checkerframework/framework/test/TypecheckResult.java @@ -8,8 +8,7 @@ import javax.tools.JavaFileObject; import org.checkerframework.framework.test.diagnostics.TestDiagnostic; import org.checkerframework.framework.test.diagnostics.TestDiagnosticUtils; -import org.checkerframework.framework.util.PluginUtil; - +import org.checkerframework.javacutil.PluginUtil; /** * Represents the test results from typechecking one or more java files using the given * TestConfiguration. diff --git a/framework/src/org/checkerframework/framework/test/diagnostics/DiagnosticKind.java b/util/src/main/java/org/checkerframework/framework/test/diagnostics/DiagnosticKind.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/diagnostics/DiagnosticKind.java rename to util/src/main/java/org/checkerframework/framework/test/diagnostics/DiagnosticKind.java diff --git a/framework/src/org/checkerframework/framework/test/diagnostics/JavaDiagnosticReader.java b/util/src/main/java/org/checkerframework/framework/test/diagnostics/JavaDiagnosticReader.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/diagnostics/JavaDiagnosticReader.java rename to util/src/main/java/org/checkerframework/framework/test/diagnostics/JavaDiagnosticReader.java diff --git a/framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnostic.java b/util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnostic.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnostic.java rename to util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnostic.java diff --git a/framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java b/util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java similarity index 96% rename from framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java rename to util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java index 3e5bf4b6e18..8fa7285714c 100644 --- a/framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java +++ b/util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticLine.java @@ -1,7 +1,7 @@ package org.checkerframework.framework.test.diagnostics; import java.util.List; -import org.checkerframework.framework.util.PluginUtil; +import org.checkerframework.javacutil.PluginUtil; /** Represents an entire line of TestDiagnostics which is essentially a list of diagnostics */ public class TestDiagnosticLine { diff --git a/framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnosticUtils.java b/util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticUtils.java similarity index 100% rename from framework/src/org/checkerframework/framework/test/diagnostics/TestDiagnosticUtils.java rename to util/src/main/java/org/checkerframework/framework/test/diagnostics/TestDiagnosticUtils.java diff --git a/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java b/util/src/taglet/java/org/checkerframework/taglet/ManualTaglet.java similarity index 98% rename from javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java rename to util/src/taglet/java/org/checkerframework/taglet/ManualTaglet.java index 01f35485e53..cc271ed2c00 100644 --- a/javacutil/src/org/checkerframework/javacutil/dist/ManualTaglet.java +++ b/util/src/taglet/java/org/checkerframework/taglet/ManualTaglet.java @@ -1,4 +1,4 @@ -package org.checkerframework.javacutil.dist; +package org.checkerframework.taglet; import com.sun.javadoc.Tag; import com.sun.tools.doclets.Taglet;