misc: Remove AnnotationHolder use

Annotation printing is handled without indexed lookups of "visible + invisible" anymore
jumanji144 · Oct 12, 2024 · 663bcb4 · 663bcb4
1 parent 7d48b18
commit 663bcb4
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 51 deletions.
diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmClassPrinter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmClassPrinter.java
@@ -129,11 +129,6 @@ public void print(PrintContext<?> ctx) {
         obj.end();
     }
 
-    @Override
-    public AnnotationPrinter annotation(int index) {
-        return memberPrinter.printAnnotation(index);
-    }
-
     @Override
     public MethodPrinter method(String name, String descriptor) {
         // find method

diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmFieldPrinter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmFieldPrinter.java
@@ -25,9 +25,4 @@ public void print(PrintContext<?> ctx) {
             ctx.print("}");
         }
     }
-
-    @Override
-    public AnnotationPrinter annotation(int index) {
-        return memberPrinter.printAnnotation(index);
-    }
 }
diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmMethodPrinter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/JvmMethodPrinter.java
@@ -179,9 +179,4 @@ public void print(PrintContext<?> ctx) {
 
         obj.end();
     }
-
-    @Override
-    public AnnotationPrinter annotation(int index) {
-        return memberPrinter.printAnnotation(index);
-    }
 }
diff --git a/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/MemberPrinter.java b/jasm-composition-jvm/src/main/java/me/darknet/assembler/printer/MemberPrinter.java
@@ -9,8 +9,6 @@
 import dev.xdark.blw.classfile.Signed;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 public record MemberPrinter(
         @Nullable Annotated annotated, @Nullable Signed signed, @Nullable Accessible accessible, Type type
 ) {
@@ -55,27 +53,6 @@ public PrintContext<?> printDeclaration(PrintContext<?> ctx) {
         return ctx;
     }
 
-    /**
-     * @param index Index into <i>all</i> annotations, where indices are based on the combined list of annotations.
-     * @return Printer for the annotation. {@code null} if the index does not point to a known annotation.
-     */
-    public @Nullable AnnotationPrinter printAnnotation(int index) {
-        if (annotated != null) {
-            // First check visible annotations.
-            List<Annotation> visibleAnnos = annotated.visibleRuntimeAnnotations();
-            int runtimeAnnotationCount = visibleAnnos.size();
-            if (index < runtimeAnnotationCount)
-                return new JvmAnnotationPrinter(visibleAnnos.get(index), true);
-
-            // Next check invisible annotations, offsetting the index by the number of visible annotations.
-            List<Annotation> invisibleAnnos = annotated.invisibleRuntimeAnnotations();
-            int targetInvisibleIndex = index - runtimeAnnotationCount;
-            if (targetInvisibleIndex < invisibleAnnos.size())
-                return new JvmAnnotationPrinter(invisibleAnnos.get(targetInvisibleIndex), false);
-        }
-        return null;
-    }
-
     enum Type {
         CLASS,
         FIELD,

diff --git a/jasm-core/src/main/java/me/darknet/assembler/printer/AnnotationHolder.java b/jasm-core/src/main/java/me/darknet/assembler/printer/AnnotationHolder.java
diff --git a/jasm-core/src/main/java/me/darknet/assembler/printer/ClassPrinter.java b/jasm-core/src/main/java/me/darknet/assembler/printer/ClassPrinter.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.Nullable;
 
-public interface ClassPrinter extends AnnotationHolder, Printer {
+public interface ClassPrinter extends Printer {
 
     @Nullable
     MethodPrinter method(String name, String descriptor);

diff --git a/jasm-core/src/main/java/me/darknet/assembler/printer/FieldPrinter.java b/jasm-core/src/main/java/me/darknet/assembler/printer/FieldPrinter.java
@@ -1,5 +1,5 @@
 package me.darknet.assembler.printer;
 
-public interface FieldPrinter extends AnnotationHolder, Printer {
+public interface FieldPrinter extends Printer {
 
 }
diff --git a/jasm-core/src/main/java/me/darknet/assembler/printer/MethodPrinter.java b/jasm-core/src/main/java/me/darknet/assembler/printer/MethodPrinter.java
@@ -1,5 +1,5 @@
 package me.darknet.assembler.printer;
 
-public interface MethodPrinter extends AnnotationHolder, Printer {
+public interface MethodPrinter extends Printer {
 
 }