actually use sorted order

njit-jerse · Aug 15, 2024 · 9af868c · 9af868c
1 parent 936e8dc
commit 9af868c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/org/checkerframework/specimin/AnnotationTargetRemoverVisitor.java b/src/main/java/org/checkerframework/specimin/AnnotationTargetRemoverVisitor.java
@@ -29,7 +29,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -136,9 +135,8 @@ else if (targetAnnotation.isNormalAnnotationExpr()) {
       List<ElementType> sortedElementTypes = new ArrayList<>(elementTypes);
       Collections.sort(sortedElementTypes, (a, b) -> a.name().compareTo(b.name()));
 
-      Iterator<ElementType> iterator = elementTypes.iterator();
-      while (iterator.hasNext()) {
-        ElementType elementType = iterator.next();
+      for (int i = 0; i < sortedElementTypes.size(); i++) {
+        ElementType elementType = sortedElementTypes.get(i);
         if (!staticallyImportedElementTypes.contains(elementType)) {
           if (useFullyQualified) {
             newAnnotation.append("java.lang.annotation.");
@@ -147,7 +145,7 @@ else if (targetAnnotation.isNormalAnnotationExpr()) {
         }
         newAnnotation.append(elementType.name());
 
-        if (iterator.hasNext()) {
+        if (i < sortedElementTypes.size() - 1) {
           newAnnotation.append(", ");
         }
       }

diff --git a/...ngenerictarget/expected/org/checkerframework/checker/initialization/qual/Initialized.java b/...ngenerictarget/expected/org/checkerframework/checker/initialization/qual/Initialized.java
@@ -1,5 +1,5 @@
 package org.checkerframework.checker.initialization.qual;
 
-@java.lang.annotation.Target({ java.lang.annotation.ElementType.TYPE_USE, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD })
+@java.lang.annotation.Target({ java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.TYPE_USE })
 public @interface Initialized {
 }
diff --git a/...rces/annoingenerictarget/expected/org/checkerframework/checker/nullness/qual/NonNull.java b/...rces/annoingenerictarget/expected/org/checkerframework/checker/nullness/qual/NonNull.java
@@ -1,5 +1,5 @@
 package org.checkerframework.checker.nullness.qual;
 
-@java.lang.annotation.Target({ java.lang.annotation.ElementType.TYPE_USE, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD })
+@java.lang.annotation.Target({ java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.TYPE_USE })
 public @interface NonNull {
 }
diff --git a/...nnoingenerictarget/expected/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java b/...nnoingenerictarget/expected/org/checkerframework/checker/nullness/qual/UnknownKeyFor.java
@@ -1,5 +1,5 @@
 package org.checkerframework.checker.nullness.qual;
 
-@java.lang.annotation.Target({ java.lang.annotation.ElementType.TYPE_USE, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.METHOD })
+@java.lang.annotation.Target({ java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.TYPE_USE })
 public @interface UnknownKeyFor {
 }
diff --git a/src/test/resources/syntheticannotationtarget/expected/com/example/AnnotationDeclaration.java b/src/test/resources/syntheticannotationtarget/expected/com/example/AnnotationDeclaration.java
@@ -1,5 +1,5 @@
 package com.example;
 
-@java.lang.annotation.Target({ java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.TYPE_USE })
+@java.lang.annotation.Target({ java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.TYPE_USE })
 public @interface AnnotationDeclaration {
 }