--- old/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java	2014-02-05 11:39:15.162596716 -0800
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java	2014-02-05 11:39:14.975930041 -0800
@@ -43,7 +43,7 @@
  * A DHT (Define Huffman Table) marker segment.
  */
 class DHTMarkerSegment extends MarkerSegment {
-    List tables = new ArrayList();
+    List<Htable> tables = new ArrayList<>();
 
     DHTMarkerSegment(boolean needFour) {
         super(JPEG.DHT);
@@ -91,12 +91,12 @@
         }
     }
 
-    protected Object clone() {
+    protected DHTMarkerSegment clone() {
         DHTMarkerSegment newGuy = (DHTMarkerSegment) super.clone();
-        newGuy.tables = new ArrayList(tables.size());
-        Iterator iter = tables.iterator();
+        newGuy.tables = new ArrayList<>(tables.size());
+        Iterator<Htable> iter = tables.iterator();
         while (iter.hasNext()) {
-            Htable table = (Htable) iter.next();
+            Htable table = iter.next();
             newGuy.tables.add(table.clone());
         }
         return newGuy;
@@ -105,7 +105,7 @@
     IIOMetadataNode getNativeNode() {
         IIOMetadataNode node = new IIOMetadataNode("dht");
         for (int i= 0; i<tables.size(); i++) {
-            Htable table = (Htable) tables.get(i);
+            Htable table = tables.get(i);
             node.appendChild(table.getNativeNode());
         }
         return node;
@@ -124,7 +124,7 @@
         System.out.println("Num tables: "
                            + Integer.toString(tables.size()));
         for (int i= 0; i<tables.size(); i++) {
-            Htable table = (Htable) tables.get(i);
+            Htable table = tables.get(i);
             table.print();
         }
         System.out.println();
@@ -205,7 +205,7 @@
 
         }
 
-        protected Object clone() {
+        protected Htable clone() {
             Htable newGuy = null;
             try {
                 newGuy = (Htable) super.clone();