java.editor.overridden package cleanup

 - jdk 17 code improvements and cleanup
 - deprecation fixes

Author: mbien

java/java.editor/src/org/netbeans/modules/java/editor/overridden/AnnotationsHolder.java

@@ -42,7 +42,7 @@ public class AnnotationsHolder implements PropertyChangeListener {
 
     private static final Logger LOGGER = Logger.getLogger(AnnotationsHolder.class.getName());
     private static final RequestProcessor WORKER = new RequestProcessor(AnnotationsHolder.class.getName(), 1, false, false);
-    private static final Map<DataObject, AnnotationsHolder> file2Annotations = new HashMap<DataObject, AnnotationsHolder>();
+    private static final Map<DataObject, AnnotationsHolder> file2Annotations = new HashMap<>();
 
     public static synchronized AnnotationsHolder get(FileObject file) {
         try {
@@ -59,12 +59,11 @@ public static synchronized AnnotationsHolder get(FileObject file) {
                 return null;
             }
 
-            file2Annotations.put(od, a = new AnnotationsHolder(od, ec));
-            
+            a = new AnnotationsHolder(od, ec);
+            file2Annotations.put(od, a);
             return a;
         } catch (IOException ex) {
             LOGGER.log(Level.INFO, null, ex);
-            
             return null;
         }
     }
@@ -75,19 +74,16 @@ public static synchronized AnnotationsHolder get(FileObject file) {
     private AnnotationsHolder(DataObject file, EditorCookie.Observable ec) {
         this.file = file;
         this.ec   = ec;
-        this.annotations = new ArrayList<IsOverriddenAnnotation>();
+        this.annotations = new ArrayList<>();
 
         ec.addPropertyChangeListener(this);
 
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-                checkForReset();
-            }
-        });
+        SwingUtilities.invokeLater(this::checkForReset);
 
         Logger.getLogger("TIMER").log(Level.FINE, "Overridden AnnotationsHolder", new Object[] {file.getPrimaryFile(), this}); //NOI18N
      }
 
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (EditorCookie.Observable.PROP_OPENED_PANES.endsWith(evt.getPropertyName()) || evt.getPropertyName() == null) {
             checkForReset();
@@ -111,26 +107,24 @@ private void checkForReset() {
     private final List<IsOverriddenAnnotation> annotations;
 
     public void setNewAnnotations(final List<IsOverriddenAnnotation> as) {
-        Runnable doAttachDetach = new Runnable() {
-            public void run() {
-                final List<IsOverriddenAnnotation> toRemove;
-                final List<IsOverriddenAnnotation> toAdd;
-                
-                synchronized (AnnotationsHolder.this) {
-                    toRemove = new ArrayList<IsOverriddenAnnotation>(annotations);
-                    toAdd    = new ArrayList<IsOverriddenAnnotation>(as);
-
-                    annotations.clear();
-                    annotations.addAll(as);
-                }
-
-                for (IsOverriddenAnnotation a : toRemove) {
-                    a.detachImpl();
-                }
+        Runnable doAttachDetach = () -> {
+            List<IsOverriddenAnnotation> toRemove;
+            List<IsOverriddenAnnotation> toAdd;
+            
+            synchronized (AnnotationsHolder.this) {
+                toRemove = new ArrayList<>(annotations);
+                toAdd    = new ArrayList<>(as);
 
-                for (IsOverriddenAnnotation a : toAdd) {
-                    a.attach();
-                }
+                annotations.clear();
+                annotations.addAll(as);
+            }
+            
+            for (IsOverriddenAnnotation a : toRemove) {
+                a.detachImpl();
+            }
+            
+            for (IsOverriddenAnnotation a : toAdd) {
+                a.attach();
             }
         };
 
@@ -140,6 +134,6 @@ public void run() {
     }
 
     public synchronized List<IsOverriddenAnnotation> getAnnotations() {
-        return new ArrayList<IsOverriddenAnnotation>(annotations);
+        return new ArrayList<>(annotations);
     }
 }

java/java.editor/src/org/netbeans/modules/java/editor/overridden/ComputeAnnotations.java

@@ -22,11 +22,11 @@
 import com.sun.source.tree.MethodTree;
 import com.sun.source.tree.Tree;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -98,7 +98,7 @@ public void run(Result result, SchedulerEvent event) {
     }
 
     List<IsOverriddenAnnotation> computeAnnotations(CompilationInfo info, StyledDocument doc) {
-        List<IsOverriddenAnnotation> annotations = new LinkedList<IsOverriddenAnnotation>();
+        List<IsOverriddenAnnotation> annotations = new LinkedList<>();
 
         createAnnotations(info, doc, new ComputeOverriding(cancel).process(info), false, annotations);
         createAnnotations(info, doc, new ComputeOverriders(cancel).process(info, null, null, false), true, annotations);
@@ -140,7 +140,7 @@ private void createAnnotations(CompilationInfo info, StyledDocument doc, Map<Ele
                     if (kb != null)
                         dn += NbBundle.getMessage(ComputeAnnotations.class, "LBL_shortcut_promotion", kb, choice); //NOI18N
                 } else {
-                    StringBuffer tooltip = new StringBuffer();
+                    StringBuilder tooltip = new StringBuilder();
                     boolean wasOverrides = false;
 
                     boolean newline = false;
@@ -171,22 +171,14 @@ private void createAnnotations(CompilationInfo info, StyledDocument doc, Map<Ele
                         dn += NbBundle.getMessage(ComputeAnnotations.class, "LBL_shortcut_promotion", kb, 3); //NOI18N
                 }
 
-                int[] elementNameSpan;
-                
-                switch (t.getKind()) {
-                    case ANNOTATION_TYPE:
-                    case CLASS:
-                    case ENUM:
-                    case INTERFACE:
-                        elementNameSpan = info.getTreeUtilities().findNameSpan((ClassTree) t);
-                        break;
-                    case METHOD:
-                        elementNameSpan = info.getTreeUtilities().findNameSpan((MethodTree) t);
-                        break;
-                    default:
-                        elementNameSpan = new int[] {(int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), t), -1};
-                        break;
-                }
+                int[] elementNameSpan = switch (t.getKind()) {
+                    case ANNOTATION_TYPE, CLASS, ENUM, INTERFACE ->
+                        info.getTreeUtilities().findNameSpan((ClassTree) t);
+                    case METHOD ->
+                        info.getTreeUtilities().findNameSpan((MethodTree) t);
+                    default ->
+                        new int[]{(int) info.getTrees().getSourcePositions().getStartPosition(info.getCompilationUnit(), t), -1};
+                };
 
                 if (elementNameSpan == null) continue;
 
@@ -220,6 +212,7 @@ public void cancel() {
     private static Position getPosition(final StyledDocument doc, final int offset) {
         class Impl implements Runnable {
             private Position pos;
+            @Override
             public void run() {
                 if (offset < 0 || offset >= doc.getLength())
                     return ;
@@ -255,7 +248,7 @@ public static final class FactoryImpl extends TaskFactory {
 
         @Override
         public Collection<? extends SchedulerTask> create(Snapshot snapshot) {
-            return Collections.singleton(new ComputeAnnotations());
+            return Set.of(new ComputeAnnotations());
         }
 
     }