Merge pull request #96 from stephanenicolas/dlemures/adding-singleton…

…-method-error Adding Singleton Method error
stephanenicolas · Jun 21, 2016 · 34aea0e · 34aea0e
2 parents faedb99 + 8813eb5
commit 34aea0e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/toothpick-compiler/src/main/java/toothpick/compiler/factory/FactoryProcessor.java b/toothpick-compiler/src/main/java/toothpick/compiler/factory/FactoryProcessor.java
@@ -109,7 +109,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
   private void findAndParseTargets(RoundEnvironment roundEnv) {
     createFactoriesForClassesWithInjectAnnotatedConstructors(roundEnv);
-    createFactoriesForClassesAnnotatedProvidesSingleton(roundEnv);
+    createFactoriesForClassesAnnotatedScopeInstances(roundEnv);
     createFactoriesForClassesAnnotatedSingleton(roundEnv);
     createFactoriesForClassesWithInjectAnnotatedFields(roundEnv);
     createFactoriesForClassesWithInjectAnnotatedMethods(roundEnv);
@@ -127,15 +127,15 @@ private void createFactoriesForClassesWithInjectAnnotatedFields(RoundEnvironment
     }
   }
 
-  private void createFactoriesForClassesAnnotatedProvidesSingleton(RoundEnvironment roundEnv) {
-    for (Element singletonAnnotatedElement : roundEnv.getElementsAnnotatedWith(ScopeInstances.class)) {
+  private void createFactoriesForClassesAnnotatedScopeInstances(RoundEnvironment roundEnv) {
+    for (Element singletonAnnotatedElement : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(ScopeInstances.class))) {
       TypeElement singletonAnnotatedTypeElement = (TypeElement) singletonAnnotatedElement;
       processClassContainingInjectAnnotatedMember(singletonAnnotatedTypeElement, mapTypeElementToConstructorInjectionTarget);
     }
   }
 
   private void createFactoriesForClassesAnnotatedSingleton(RoundEnvironment roundEnv) {
-    for (Element singletonAnnotatedElement : roundEnv.getElementsAnnotatedWith(Singleton.class)) {
+    for (Element singletonAnnotatedElement : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Singleton.class))) {
       TypeElement singletonAnnotatedTypeElement = (TypeElement) singletonAnnotatedElement;
       processClassContainingInjectAnnotatedMember(singletonAnnotatedTypeElement, mapTypeElementToConstructorInjectionTarget);
     }