8271603: Unnecessary Vector usage in java.desktop

src/java.desktop/share/classes/java/awt/Menu.java

@@ -32,8 +32,8 @@
 import java.io.ObjectOutputStream;
 import java.io.Serial;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.EventListener;
-import java.util.Iterator;
 import java.util.Vector;
 
 import javax.accessibility.Accessible;
@@ -487,15 +487,15 @@ MenuItem getShortcutMenuItem(MenuShortcut s) {
         return null;
     }
 
-    synchronized Iterator<MenuShortcut> shortcuts() {
-        ArrayList<MenuShortcut> shortcuts = new ArrayList<>();
+    synchronized Enumeration<MenuShortcut> shortcuts() {
+        Vector<MenuShortcut> shortcuts = new Vector<>();
         int nitems = getItemCount();
         for (int i = 0 ; i < nitems ; i++) {
             MenuItem mi = getItem(i);
             if (mi instanceof Menu) {
-                Iterator<MenuShortcut> e = ((Menu)mi).shortcuts();
-                while (e.hasNext()) {
-                    shortcuts.add(e.next());
+                Enumeration<MenuShortcut> e = ((Menu)mi).shortcuts();
+                while (e.hasMoreElements()) {
+                    shortcuts.addElement(e.nextElement());
                 }
             } else {
                 MenuShortcut ms = mi.getShortcut();
@@ -504,7 +504,7 @@ synchronized Iterator<MenuShortcut> shortcuts() {
                 }
             }
         }
-        return shortcuts.iterator();
+        return shortcuts.elements();
     }
 
     void deleteShortcut(MenuShortcut s) {

src/java.desktop/share/classes/java/awt/MenuBar.java

@@ -33,7 +33,6 @@
 import java.io.Serial;
 import java.util.Enumeration;
 import java.util.EventListener;
-import java.util.Iterator;
 import java.util.Vector;
 
 import javax.accessibility.Accessible;
@@ -343,9 +342,9 @@ public synchronized Enumeration<MenuShortcut> shortcuts() {
         Vector<MenuShortcut> shortcuts = new Vector<>();
         int nmenus = getMenuCount();
         for (int i = 0 ; i < nmenus ; i++) {
-            Iterator<MenuShortcut> e = getMenu(i).shortcuts();
-            while (e.hasNext()) {
-                shortcuts.addElement(e.next());
+            Enumeration<MenuShortcut> e = getMenu(i).shortcuts();
+            while (e.hasMoreElements()) {
+                shortcuts.addElement(e.nextElement());
             }
         }
         return shortcuts.elements();

src/java.desktop/share/classes/javax/print/MimeType.java

@@ -572,8 +572,8 @@ private void parse(String s) {
         }
         LexicalAnalyzer theLexer = new LexicalAnalyzer (s);
         ArrayList<String> thePieces = new ArrayList<>();
-        boolean mediaTypeIsText;
-        boolean parameterNameIsCharset;
+        boolean mediaTypeIsText = false;
+        boolean parameterNameIsCharset = false;
 
         // Parse media type.
         if (theLexer.getLexemeType() == TOKEN_LEXEME) {

src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java

@@ -662,7 +662,7 @@ public static AudioFormat.Encoding[] getTargetEncodings(AudioFormat.Encoding sou
         List<FormatConversionProvider> codecs = getFormatConversionProviders();
         ArrayList<AudioFormat.Encoding> encodings = new ArrayList<>();
 
-        AudioFormat.Encoding[] encs;
+        AudioFormat.Encoding[] encs = null;
 
         // gather from all the codecs
         for(int i=0; i<codecs.size(); i++ ) {