modernize usage of collection templates

stephengold · Jul 12, 2024 · 8c8f1d7 · 8c8f1d7
1 parent b715db3
commit 8c8f1d7
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 23 deletions.
diff --git a/library/src/main/java/de/jarnbjo/flac/FlacStream.java b/library/src/main/java/de/jarnbjo/flac/FlacStream.java
@@ -33,7 +33,7 @@
 public class FlacStream {
     private LogicalOggStream oggStream;
 
-    final private List metadataBlocks = new ArrayList();
+    final private List<MetadataBlock> metadataBlocks = new ArrayList<>();
 
     private StreamInfo streamInfo;
     private VorbisComment vorbisComment;

diff --git a/library/src/main/java/de/jarnbjo/flac/VorbisComment.java b/library/src/main/java/de/jarnbjo/flac/VorbisComment.java
@@ -23,7 +23,7 @@ public class VorbisComment extends MetadataBlock {
     public static final String ISRC = "ISRC";
 
     final private String vendor;
-    final private HashMap comments = new HashMap();
+    final private HashMap<String, ArrayList<String>> comments = new HashMap<>();
 
     public VorbisComment(BitInputStream source) throws IOException {
         int length = source.getInt(24);
@@ -48,9 +48,9 @@ public VorbisComment(BitInputStream source) throws IOException {
     private void addComment(String key, String value) {
         System.out.println(key + " = " + value);
 
-        ArrayList al = (ArrayList) comments.get(key);
+        ArrayList<String> al = comments.get(key);
         if (al == null) {
-            al = new ArrayList();
+            al = new ArrayList<>();
             comments.put(key, al);
         }
         al.add(value);
@@ -61,14 +61,13 @@ public String getVendor() {
     }
 
     public String getComment(String key) {
-        ArrayList al = (ArrayList) comments.get(key);
-        return al == null ? null : (String) al.get(0);
+        ArrayList<String> al = comments.get(key);
+        return al == null ? null : al.get(0);
     }
 
     public String[] getComments(String key) {
-        ArrayList al = (ArrayList) comments.get(key);
-        return al == null ? new String[0]
-                : (String[]) al.toArray(new String[al.size()]);
+        ArrayList<String> al = comments.get(key);
+        return al == null ? new String[0] : al.toArray(new String[0]);
     }
 
     public String getTitle() {

diff --git a/library/src/main/java/de/jarnbjo/jmf/OggJmfStream.java b/library/src/main/java/de/jarnbjo/jmf/OggJmfStream.java
@@ -47,7 +47,8 @@ public class OggJmfStream implements PhysicalOggStream {
     final private PullSourceStream source;
     final private long[] pageOffsets;
 
-    final private HashMap logicalStreams = new HashMap();
+    final private HashMap<Integer, LogicalOggStreamImpl> logicalStreams
+            = new HashMap<>();
 
     /**
      * Creates access to the specified {@code PullSourceStream} through the
@@ -68,7 +69,7 @@ public OggJmfStream(PullSourceStream source)
             throw new OggFormatException("The source stream must be seekable.");
         }
 
-        List po = new ArrayList();
+        List<Long> po = new ArrayList<>();
         int pageNumber = 0;
         try {
             while (true) {

diff --git a/vorbis/src/main/java/de/jarnbjo/ogg/LogicalOggStreamImpl.java b/vorbis/src/main/java/de/jarnbjo/ogg/LogicalOggStreamImpl.java
@@ -34,8 +34,8 @@ public class LogicalOggStreamImpl implements LogicalOggStream {
     final private PhysicalOggStream source;
     final private int serialNumber;
 
-    final private ArrayList pageNumberMapping = new ArrayList();
-    final private ArrayList granulePositions = new ArrayList();
+    final private ArrayList<Integer> pageNumberMapping = new ArrayList<>();
+    final private ArrayList<Long> granulePositions = new ArrayList<>();
 
     private int pageIndex = 0;
     private OggPage currentPage;

diff --git a/vorbis/src/main/java/de/jarnbjo/vorbis/CommentHeader.java b/vorbis/src/main/java/de/jarnbjo/vorbis/CommentHeader.java
@@ -57,7 +57,7 @@ public class CommentHeader {
             = "METADATA_BLOCK_PICTURE";
 
     final private String vendor;
-    final private HashMap comments = new HashMap();
+    final private HashMap<String, ArrayList<String>> comments = new HashMap<>();
     private boolean framingBit;
 
     private static final long HEADER = 0x736962726f76L; // 'vorbis'
@@ -101,9 +101,9 @@ public static String byteBufferToString(
     }
 
     private void addComment(String key, String value) {
-        ArrayList al = (ArrayList) comments.get(key);
+        ArrayList<String> al = comments.get(key);
         if (al == null) {
-            al = new ArrayList();
+            al = new ArrayList<>();
             comments.put(key, al);
         }
         al.add(value);
@@ -114,14 +114,13 @@ public String getVendor() {
     }
 
     public String getComment(String key) {
-        ArrayList al = (ArrayList) comments.get(key);
-        return al == null ? null : (String) al.get(0);
+        ArrayList<String> al = comments.get(key);
+        return al == null ? null : al.get(0);
     }
 
     public String[] getComments(String key) {
-        ArrayList al = (ArrayList) comments.get(key);
-        return al == null ? new String[0]
-                : (String[]) al.toArray(new String[al.size()]);
+        ArrayList<String> al = comments.get(key);
+        return al == null ? new String[0] : al.toArray(new String[0]);
     }
 
     public String getTitle() {

diff --git a/vorbis/src/main/java/de/jarnbjo/vorbis/Floor1.java b/vorbis/src/main/java/de/jarnbjo/vorbis/Floor1.java
@@ -89,7 +89,7 @@ protected Floor1(BitInputStream source, SetupHeader header)
 
         int floorValues = 0;
 
-        List alXList = new ArrayList();
+        List<Integer> alXList = new ArrayList<>();
 
         alXList.add(0);
         alXList.add(1 << rangeBits);

diff --git a/vorbis/src/main/java/de/jarnbjo/vorbis/Residue.java b/vorbis/src/main/java/de/jarnbjo/vorbis/Residue.java
@@ -34,7 +34,7 @@ abstract class Residue {
     protected int classBook; // groupbook
     protected int[] cascade; // secondstages
     protected int[][] books;
-    protected HashMap looks = new HashMap();
+    protected HashMap<Mode, Look> looks = new HashMap<>();
 
     protected Residue() {
     }