From 76df91d14bc698945d52c41a4cccfae80c648c73 Mon Sep 17 00:00:00 2001 From: Dmitrii Tikhomirov Date: Thu, 12 Sep 2019 17:52:34 +0200 Subject: [PATCH] unable to process @Template without gwt-user in classpath --- .../org/gwtproject/safehtml/apt/SafeHtmlProcessor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/processor/src/main/java/org/gwtproject/safehtml/apt/SafeHtmlProcessor.java b/processor/src/main/java/org/gwtproject/safehtml/apt/SafeHtmlProcessor.java index 6a96664..331e641 100644 --- a/processor/src/main/java/org/gwtproject/safehtml/apt/SafeHtmlProcessor.java +++ b/processor/src/main/java/org/gwtproject/safehtml/apt/SafeHtmlProcessor.java @@ -55,9 +55,11 @@ public boolean process(Set annotations, RoundEnvironment templateTypes.addAll(roundEnv.getElementsAnnotatedWith(processingEnv.getElementUtils().getTypeElement(TEMPLATE_ANNOTATION_NAME)) .stream().map(Element::getEnclosingElement).map(TypeElement.class::cast).collect(Collectors.toSet())); - templateTypes.addAll(roundEnv.getElementsAnnotatedWith(processingEnv.getElementUtils().getTypeElement(OLD_TEMPLATE_ANNOTATION_NAME)) - .stream().map(Element::getEnclosingElement).map(TypeElement.class::cast).collect(Collectors.toSet())); - + TypeElement oldTemplateAnnotationName = processingEnv.getElementUtils().getTypeElement(OLD_TEMPLATE_ANNOTATION_NAME); + if (oldTemplateAnnotationName != null) { + templateTypes.addAll(roundEnv.getElementsAnnotatedWith(oldTemplateAnnotationName) + .stream().map(Element::getEnclosingElement).map(TypeElement.class::cast).collect(Collectors.toSet())); + } for (TypeElement templateType : templateTypes) { try { String packageName = processingEnv.getElementUtils().getPackageOf(templateType).getQualifiedName().toString();