address comment

zcai1 · Feb 24, 2022 · 5826a00 · 5826a00
1 parent 1827620
commit 5826a00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/checkers/inference/DefaultSlotManager.java b/src/checkers/inference/DefaultSlotManager.java
@@ -143,12 +143,14 @@ public class DefaultSlotManager implements SlotManager {
 
     private final Set<Class<? extends Annotation>> realQualifiers;
     private final ProcessingEnvironment processingEnvironment;
+    private final InferenceChecker inferenceChecker;
 
-    public DefaultSlotManager( final ProcessingEnvironment processingEnvironment,
+    public DefaultSlotManager( final InferenceChecker inferenceChecker,
                                final AnnotationMirror realTop,
                                final Set<Class<? extends Annotation>> realQualifiers,
                                boolean storeConstants) {
-        this.processingEnvironment = processingEnvironment;
+        this.inferenceChecker = inferenceChecker;
+        this.processingEnvironment = inferenceChecker.getProcessingEnvironment();
         this.realTop = realTop;
         // sort the qualifiers so that they are always assigned the same varId
         this.realQualifiers = sortAnnotationClasses(realQualifiers);
@@ -405,7 +407,7 @@ public SourceVariableSlot createSourceVariableSlot(AnnotationLocation location,
 
         if (!defaultAnnotationsCache.containsKey(tree)) {
             // If cache misses, we check if the top level class has changed.
-            ClassTree topLevelClass = InferenceMain.getInstance().getVisitor().getCurrentTopLevelClass();
+            ClassTree topLevelClass = inferenceChecker.getCurrentTopLevelClass();
 
             if (!defaultAnnotationsCache.containsKey(topLevelClass)) {
                 // If the top level has changed, we refresh our cache with the new scope.

diff --git a/src/checkers/inference/InferenceChecker.java b/src/checkers/inference/InferenceChecker.java
@@ -38,15 +38,6 @@ protected BaseTypeVisitor<?> createSourceVisitor() {
         return null;
     }
 
-    @Override
-    public Properties getMessagesProperties() {
-        // Add the messages.properties file defined in the same location as
-        // InferenceChecker
-        Properties messages = super.getMessagesProperties();
-        messages.putAll(getProperties(this.getClass(), MSGS_FILE, true));
-        return messages;
-    }
-
     @Override
     public void typeProcess(TypeElement element, TreePath treePath) {
         // As the entry point for type processing, each time we will receive

diff --git a/src/checkers/inference/InferenceMain.java b/src/checkers/inference/InferenceMain.java
@@ -363,7 +363,7 @@ public SlotManager getSlotManager() {
             }
 
             slotManager = new DefaultSlotManager(
-                    inferenceChecker.getProcessingEnvironment(),
+                    inferenceChecker,
                     tops.iterator().next(),
                     realTypeFactory.getSupportedTypeQualifiers(),
                     true