diff --git a/src/main/java/org/microbean/construct/DefaultDomain.java b/src/main/java/org/microbean/construct/DefaultDomain.java index 65cbd91..d30e3f0 100644 --- a/src/main/java/org/microbean/construct/DefaultDomain.java +++ b/src/main/java/org/microbean/construct/DefaultDomain.java @@ -272,13 +272,18 @@ public List directSupertypes(TypeMirror t) { } @Override // Domain - public Element element(TypeMirror t) { + public UniversalElement element(TypeMirror t) { t = unwrap(t); try (var lock = lock()) { return UniversalElement.of(this.types().asElement(t), this); } } + @Override // Domain + public UniversalType elementType(final TypeMirror t) { + return UniversalType.of(Domain.super.elementType(t), this); + } + private final Elements elements() { return this.pe().getElementUtils(); } @@ -428,7 +433,7 @@ public UniversalType rawType(final TypeMirror t) { // (Canonical.) @Override // Domain - public RecordComponentElement recordComponentElement(ExecutableElement e) { + public UniversalElement recordComponentElement(ExecutableElement e) { e = unwrap(e); try (var lock = lock()) { return UniversalElement.of(this.elements().recordComponentFor(e), this); diff --git a/src/main/java/org/microbean/construct/Processor.java b/src/main/java/org/microbean/construct/Processor.java index a27c57d..29a32d7 100644 --- a/src/main/java/org/microbean/construct/Processor.java +++ b/src/main/java/org/microbean/construct/Processor.java @@ -104,7 +104,6 @@ public final void init(final ProcessingEnvironment pe) { this.c.awaitUninterruptibly(); } } finally { - System.out.println("in finally block; running cleanup"); this.r.run(); this.lock.unlock(); }