Version 7, February 2009

[GpsPrune.git] / tim / prune / drew / jpeg / JpegSegmentData.java

diff --git a/tim/prune/drew/jpeg/JpegSegmentData.java b/tim/prune/drew/jpeg/JpegSegmentData.java
index 23197f8c1fb105f8e6dc0068f60e3f67110dcfc1..8541a08b9b146eae3ce938b4b9d858b655fed890 100644 (file)
--- a/tim/prune/drew/jpeg/JpegSegmentData.java
+++ b/tim/prune/drew/jpeg/JpegSegmentData.java
@@ -12,17 +12,9 @@ import java.util.List;
 public class JpegSegmentData\r
 {\r
        /** A map of byte[], keyed by the segment marker */\r
-       private final HashMap _segmentDataMap;\r
+       private final HashMap<Byte, List<byte[]>> _segmentDataMap = new HashMap<Byte, List<byte[]>>(10);\r
 \r
 \r
-       /**\r
-        * Constructor for an empty collection\r
-        */\r
-       public JpegSegmentData()\r
-       {\r
-               _segmentDataMap = new HashMap(10);\r
-       }\r
-\r
        /**\r
         * Add a segment to the collection\r
         * @param inSegmentMarker marker byte\r
@@ -30,7 +22,7 @@ public class JpegSegmentData
         */\r
        public void addSegment(byte inSegmentMarker, byte[] inSegmentBytes)\r
        {\r
-               List segmentList = getOrCreateSegmentList(inSegmentMarker);\r
+               List<byte[]> segmentList = getOrCreateSegmentList(inSegmentMarker);\r
                segmentList.add(inSegmentBytes);\r
        }\r
 \r
@@ -54,12 +46,12 @@ public class JpegSegmentData
         */\r
        public byte[] getSegment(byte inSegmentMarker, int inOccurrence)\r
        {\r
-               final List segmentList = getSegmentList(inSegmentMarker);\r
+               final List<byte[]> segmentList = getSegmentList(inSegmentMarker);\r
 \r
                if (segmentList==null || segmentList.size()<=inOccurrence)\r
                        return null;\r
                else\r
-                       return (byte[]) segmentList.get(inOccurrence);\r
+                       return segmentList.get(inOccurrence);\r
        }\r
 \r
 \r
@@ -70,7 +62,7 @@ public class JpegSegmentData
         */\r
        public int getSegmentCount(byte inSegmentMarker)\r
        {\r
-               final List segmentList = getSegmentList(inSegmentMarker);\r
+               final List<byte[]> segmentList = getSegmentList(inSegmentMarker);\r
                if (segmentList == null)\r
                        return 0;\r
                else\r
@@ -83,9 +75,9 @@ public class JpegSegmentData
         * @param inSegmentMarker marker byte\r
         * @return list of segments\r
         */\r
-       private List getSegmentList(byte inSegmentMarker)\r
+       private List<byte[]> getSegmentList(byte inSegmentMarker)\r
        {\r
-               return (List)_segmentDataMap.get(new Byte(inSegmentMarker));\r
+               return _segmentDataMap.get(Byte.valueOf(inSegmentMarker));\r
        }\r
 \r
 \r
@@ -94,19 +86,19 @@ public class JpegSegmentData
         * @param inSegmentMarker marker byte\r
         * @return list of segments\r
         */\r
-       private List getOrCreateSegmentList(byte inSegmentMarker)\r
+       private List<byte[]> getOrCreateSegmentList(byte inSegmentMarker)\r
        {\r
-               List segmentList = null;\r
-               Byte key = new Byte(inSegmentMarker);\r
+               List<byte[]> segmentList = null;\r
+               Byte key = Byte.valueOf(inSegmentMarker);\r
                if (_segmentDataMap.containsKey(key))\r
                {\r
                        // list already exists\r
-                       segmentList = (List)_segmentDataMap.get(key);\r
+                       segmentList = _segmentDataMap.get(key);\r
                }\r
                else\r
                {\r
                        // create new list and add it\r
-                       segmentList = new ArrayList();\r
+                       segmentList = new ArrayList<byte[]>();\r
                        _segmentDataMap.put(key, segmentList);\r
                }\r
                return segmentList;\r