Make List type safe. Remove/suppress all warnings.

[marc4j.git] / src / org / marc4j / marc / impl / DataFieldImpl.java

diff --git a/src/org/marc4j/marc/impl/DataFieldImpl.java b/src/org/marc4j/marc/impl/DataFieldImpl.java
index 6a684f5..dfed133 100644 (file)
--- a/src/org/marc4j/marc/impl/DataFieldImpl.java
+++ b/src/org/marc4j/marc/impl/DataFieldImpl.java
@@ -36,19 +36,24 @@ import org.marc4j.marc.Subfield;
  */\r
 public class DataFieldImpl extends VariableFieldImpl implements DataField {\r
 \r
+    /**\r
+    * \r
+    */\r
+    private static final long serialVersionUID = -1804044736102463060L;\r
+\r
     private Long id;\r
     \r
     private char ind1;\r
 \r
     private char ind2;\r
 \r
-    private List subfields;\r
+    private List<Subfield> subfields;\r
 \r
     /**\r
      * Creates a new <code>DataField</code>.\r
      */\r
     public DataFieldImpl() {\r
-        subfields = new ArrayList();\r
+        subfields = new ArrayList<Subfield>();\r
     }\r
 \r
     /**\r
@@ -148,13 +153,13 @@ public class DataFieldImpl extends VariableFieldImpl implements DataField {
      * \r
      * @return List - the list of <code>Subfield</code> objects\r
      */\r
-    public List getSubfields() {\r
+    public List<Subfield> getSubfields() {\r
         return subfields;\r
     }\r
 \r
-    public List getSubfields(char code) {\r
-        List retSubfields = new ArrayList();\r
-        Iterator i = subfields.iterator();\r
+    public List<Subfield> getSubfields(char code) {\r
+        List<Subfield> retSubfields = new ArrayList<Subfield>();\r
+        Iterator<Subfield> i = subfields.iterator();\r
         while (i.hasNext()) {\r
             Subfield sf = (Subfield) i.next();\r
             if (sf.getCode() == code)\r
@@ -164,7 +169,7 @@ public class DataFieldImpl extends VariableFieldImpl implements DataField {
     }\r
 \r
     public Subfield getSubfield(char code) {\r
-        Iterator i = subfields.iterator();\r
+        Iterator<Subfield> i = subfields.iterator();\r
         while (i.hasNext()) {\r
             Subfield sf = (Subfield) i.next();\r
             if (sf.getCode() == code)\r
@@ -174,7 +179,7 @@ public class DataFieldImpl extends VariableFieldImpl implements DataField {
     }\r
 \r
     public boolean find(String pattern) {\r
-        Iterator i = subfields.iterator();\r
+        Iterator<Subfield> i = subfields.iterator();\r
         while (i.hasNext()) {\r
             Subfield sf = (Subfield) i.next();\r
             if (sf.find(pattern))\r
@@ -201,7 +206,7 @@ public class DataFieldImpl extends VariableFieldImpl implements DataField {
         sb.append(' ');\r
         sb.append(getIndicator1());\r
         sb.append(getIndicator2());\r
-        Iterator i = getSubfields().iterator();\r
+        Iterator<Subfield> i = getSubfields().iterator();\r
         while (i.hasNext()) {\r
             Subfield sf = (Subfield) i.next();\r
             sb.append(sf.toString());\r