Make List type safe. Remove/suppress all warnings.

diff --git a/src/org/marc4j/ErrorHandler.java b/src/org/marc4j/ErrorHandler.java
index 63e5bc8..e201608 100644 (file)
--- a/src/org/marc4j/ErrorHandler.java
+++ b/src/org/marc4j/ErrorHandler.java
@@ -74,7 +74,7 @@ public class ErrorHandler {
         */ \r
     public final static int INFO = 0;\r
     \r
-    private List errors;\r
+    private List<Error> errors;\r
     private String curRecordID;\r
     private String curField;\r
     private String curSubfield;\r
@@ -171,7 +171,7 @@ public class ErrorHandler {
      *  \r
      * @return List - A list of all of the errors encountered for the current record.\r
      */\r
-    public List getErrors()\r
+    public List<Error> getErrors()\r
     {\r
         if (errors == null || errors.size() == 0) return null;        \r
         return(errors);\r
@@ -202,7 +202,7 @@ public class ErrorHandler {
     {\r
         if (errors == null) \r
         {\r
-            errors = new LinkedList();\r
+            errors = new LinkedList<Error>();\r
             hasMissingID = false;\r
         }\r
         if (id != null && id.equals("unknown"))  hasMissingID = true;\r
@@ -231,7 +231,7 @@ public class ErrorHandler {
     {\r
         if (id != null)\r
         { \r
-            Iterator iter = errors.iterator();       \r
+            Iterator<Error> iter = errors.iterator();       \r
             while (iter.hasNext())\r
             {\r
                 Error err = (Error)(iter.next());\r

diff --git a/src/org/marc4j/MarcException.java b/src/org/marc4j/MarcException.java
index 0fb40cd..1bb0cda 100644 (file)
--- a/src/org/marc4j/MarcException.java
+++ b/src/org/marc4j/MarcException.java
@@ -30,6 +30,11 @@ package org.marc4j;
 public class MarcException extends RuntimeException {\r
 \r
   /**\r
+   * \r
+   */\r
+  private static final long serialVersionUID = -7600942667740838717L;\r
+\r
+  /**\r
    * Create a new <code>MarcException</code> with no detail mesage.\r
    */\r
   public MarcException() {\r

diff --git a/src/org/marc4j/MarcPermissiveStreamReader.java b/src/org/marc4j/MarcPermissiveStreamReader.java
index 1f0df96..e907194 100644 (file)
--- a/src/org/marc4j/MarcPermissiveStreamReader.java
+++ b/src/org/marc4j/MarcPermissiveStreamReader.java
@@ -27,15 +27,11 @@ import java.io.IOException;
 import java.io.InputStream;\r
 import java.io.InputStreamReader;\r
 import java.io.UnsupportedEncodingException;\r
-import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.List;\r
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
-import org.marc4j.Constants;\r
-import org.marc4j.MarcException;\r
-import org.marc4j.MarcReader;\r
 import org.marc4j.converter.CharConverter;\r
 import org.marc4j.converter.impl.AnselToUnicode;\r
 import org.marc4j.converter.impl.Iso5426ToUnicode;\r
@@ -285,7 +281,7 @@ public class MarcPermissiveStreamReader implements MarcReader {
             {\r
                 input.readFully(recordBuf);\r
             }\r
-            String tmp = new String(recordBuf);\r
+            //String tmp = new String(recordBuf);\r
             parseRecord(record, byteArray, recordBuf, recordLength);\r
 \r
             if (this.convertToUTF8)\r

diff --git a/src/org/marc4j/MarcStreamReader.java b/src/org/marc4j/MarcStreamReader.java
index 3fc1d9b..473450a 100644 (file)
--- a/src/org/marc4j/MarcStreamReader.java
+++ b/src/org/marc4j/MarcStreamReader.java
@@ -28,9 +28,6 @@ import java.io.IOException;
 import java.io.InputStream;\r
 import java.io.InputStreamReader;\r
 import java.io.UnsupportedEncodingException;\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.List;\r
 \r
 import org.marc4j.converter.CharConverter;\r
 import org.marc4j.converter.impl.AnselToUnicode;\r
@@ -40,7 +37,6 @@ import org.marc4j.marc.Leader;
 import org.marc4j.marc.MarcFactory;\r
 import org.marc4j.marc.Record;\r
 import org.marc4j.marc.Subfield;\r
-import org.marc4j.marc.VariableField;\r
 import org.marc4j.marc.impl.Verifier;\r
 \r
 /**\r
@@ -216,7 +212,7 @@ public class MarcStreamReader implements MarcReader {
             \r
             for (int i = 0; i < size; i++) \r
             {\r
-                int fieldLength = getFieldLength(inputrec);\r
+                //int fieldLength = getFieldLength(inputrec);\r
                 if (Verifier.isControlField(tags[i])) \r
                 {\r
                     byteArray = new byte[lengths[i] - 1];\r
@@ -301,6 +297,7 @@ public class MarcStreamReader implements MarcReader {
         return dataField;\r
     }\r
     \r
+    @SuppressWarnings("unused")\r
     private int getFieldLength(DataInputStream bais) throws IOException \r
     {\r
         bais.mark(9999);\r

diff --git a/src/org/marc4j/MarcStreamWriter.java b/src/org/marc4j/MarcStreamWriter.java
index 0023722..46274be 100644 (file)
--- a/src/org/marc4j/MarcStreamWriter.java
+++ b/src/org/marc4j/MarcStreamWriter.java
@@ -135,8 +135,8 @@ public class MarcStreamWriter implements MarcWriter {
             ByteArrayOutputStream dir = new ByteArrayOutputStream();\r
 \r
             // control fields\r
-            List fields = record.getControlFields();\r
-            Iterator i = fields.iterator();\r
+            List<ControlField> fields = record.getControlFields();\r
+            Iterator<ControlField> i = fields.iterator();\r
             while (i.hasNext()) {\r
                 ControlField cf = (ControlField) i.next();\r
 \r
@@ -148,16 +148,16 @@ public class MarcStreamWriter implements MarcWriter {
             }\r
 \r
             // data fields\r
-            fields = record.getDataFields();\r
-            i = fields.iterator();\r
-            while (i.hasNext()) {\r
-                DataField df = (DataField) i.next();\r
+            List<DataField> dataFields = record.getDataFields();\r
+            Iterator<DataField> di = dataFields.iterator();\r
+            while (di.hasNext()) {\r
+                DataField df = di.next();\r
                 data.write(df.getIndicator1());\r
                 data.write(df.getIndicator2());\r
-                List subfields = df.getSubfields();\r
-                Iterator si = subfields.iterator();\r
+                List<Subfield> subfields = df.getSubfields();\r
+                Iterator<Subfield> si = subfields.iterator();\r
                 while (si.hasNext()) {\r
-                    Subfield sf = (Subfield) si.next();\r
+                    Subfield sf = si.next();\r
                     data.write(Constants.US);\r
                     data.write(sf.getCode());\r
                     data.write(getDataElement(sf.getData()));\r

diff --git a/src/org/marc4j/MarcXmlHandler.java b/src/org/marc4j/MarcXmlHandler.java
index 5b6bf38..c07d9f7 100644 (file)
--- a/src/org/marc4j/MarcXmlHandler.java
+++ b/src/org/marc4j/MarcXmlHandler.java
@@ -31,7 +31,6 @@ import org.marc4j.marc.Record;
 import org.marc4j.marc.Subfield;\r
 import org.xml.sax.Attributes;\r
 import org.xml.sax.ContentHandler;\r
-import org.xml.sax.InputSource;\r
 import org.xml.sax.Locator;\r
 import org.xml.sax.SAXException;\r
 \r
@@ -46,7 +45,7 @@ public class MarcXmlHandler implements ContentHandler {
 \r
   private RecordStack queue;\r
 \r
-  private InputSource input;\r
+  //private InputSource input;\r
 \r
   private StringBuffer sb;\r
 \r
@@ -86,12 +85,12 @@ public class MarcXmlHandler implements ContentHandler {
   private static final String IND_2_ATTR = "ind2";\r
 \r
   /** Hashset for mapping of element strings to constants (Integer) */\r
-  private static final HashMap elementMap;\r
+  private static final HashMap<String, Integer> elementMap;\r
 \r
   private MarcFactory factory = null;\r
 \r
   static {\r
-    elementMap = new HashMap();\r
+    elementMap = new HashMap<String, Integer>();\r
     elementMap.put("collection", new Integer(COLLECTION_ID));\r
     elementMap.put("leader", new Integer(LEADER_ID));\r
     elementMap.put("record", new Integer(RECORD_ID));\r

diff --git a/src/org/marc4j/MarcXmlWriter.java b/src/org/marc4j/MarcXmlWriter.java
index a28981a..7e52fc2 100644 (file)
--- a/src/org/marc4j/MarcXmlWriter.java
+++ b/src/org/marc4j/MarcXmlWriter.java
@@ -94,8 +94,8 @@ import com.ibm.icu.text.Normalizer;
  * <p>\r
  * In addition you can perform Unicode normalization. This is for example not\r
  * done by the MARC-8 to UCS/Unicode converter. With Unicode normalization text\r
- * is transformed into the canonical composed form. For example &quot;a´bc&quot;\r
- * is normalized to &quot;ábc&quot;. To perform normalization set Unicode\r
+ * is transformed into the canonical composed form. For example &quot;a�bc&quot;\r
+ * is normalized to &quot;�bc&quot;. To perform normalization set Unicode\r
  * normalization to true:\r
  * </p>\r
  * \r
@@ -218,7 +218,7 @@ public class MarcXmlWriter implements MarcWriter {
     /**\r
      * Character encoding. Default is UTF-8.\r
      */\r
-    private String encoding = "UTF8";\r
+    //private String encoding = "UTF8";\r
 \r
     private CharConverter converter = null;\r
 \r
@@ -273,7 +273,7 @@ public class MarcXmlWriter implements MarcWriter {
             setIndent(indent);\r
             writer = new OutputStreamWriter(out, encoding);\r
             writer = new BufferedWriter(writer);\r
-            this.encoding = encoding;\r
+            // this.encoding = encoding;\r
             setHandler(new StreamResult(writer), null);\r
         } catch (UnsupportedEncodingException e) {\r
             throw new MarcException(e.getMessage(), e);\r
@@ -487,9 +487,9 @@ public class MarcXmlWriter implements MarcWriter {
         handler.characters(temp, 0, temp.length);\r
         handler.endElement(Constants.MARCXML_NS_URI, LEADER, LEADER);\r
 \r
-        Iterator i = record.getControlFields().iterator();\r
-        while (i.hasNext()) {\r
-            ControlField field = (ControlField) i.next();\r
+        Iterator<ControlField> ci = record.getControlFields().iterator();\r
+        while (ci.hasNext()) {\r
+            ControlField field = (ControlField) ci.next();\r
             atts = new AttributesImpl();\r
             atts.addAttribute("", "tag", "tag", "CDATA", field.getTag());\r
 \r
@@ -504,9 +504,9 @@ public class MarcXmlWriter implements MarcWriter {
                     CONTROL_FIELD);\r
         }\r
 \r
-        i = record.getDataFields().iterator();\r
-        while (i.hasNext()) {\r
-            DataField field = (DataField) i.next();\r
+        Iterator<DataField> di = record.getDataFields().iterator();\r
+        while (di.hasNext()) {\r
+            DataField field = di.next();\r
             atts = new AttributesImpl();\r
             atts.addAttribute("", "tag", "tag", "CDATA", field.getTag());\r
             atts.addAttribute("", "ind1", "ind1", "CDATA", String.valueOf(field\r
@@ -519,9 +519,9 @@ public class MarcXmlWriter implements MarcWriter {
 \r
             handler.startElement(Constants.MARCXML_NS_URI, DATA_FIELD,\r
                     DATA_FIELD, atts);\r
-            Iterator j = field.getSubfields().iterator();\r
-            while (j.hasNext()) {\r
-                Subfield subfield = (Subfield) j.next();\r
+            Iterator<Subfield> si = field.getSubfields().iterator();\r
+            while (si.hasNext()) {\r
+                Subfield subfield = (Subfield) si.next();\r
                 atts = new AttributesImpl();\r
                 atts.addAttribute("", "code", "code", "CDATA", String\r
                         .valueOf(subfield.getCode()));\r

diff --git a/src/org/marc4j/RecordStack.java b/src/org/marc4j/RecordStack.java
index 3346510..c8c212a 100644 (file)
--- a/src/org/marc4j/RecordStack.java
+++ b/src/org/marc4j/RecordStack.java
@@ -35,7 +35,7 @@ import org.marc4j.marc.Record;
  */\r
 public class RecordStack {\r
 \r
-  private List list;\r
+  private List<Record> list;\r
   private RuntimeException re = null;\r
   private boolean eof = false;\r
 \r
@@ -44,7 +44,7 @@ public class RecordStack {
    *  \r
    */\r
   public RecordStack() {\r
-    list = new ArrayList();\r
+    list = new ArrayList<Record>();\r
   }\r
 \r
   /**\r

diff --git a/src/org/marc4j/converter/impl/AnselToUnicode.java b/src/org/marc4j/converter/impl/AnselToUnicode.java
index b9d6c26..1d62ed5 100644 (file)
--- a/src/org/marc4j/converter/impl/AnselToUnicode.java
+++ b/src/org/marc4j/converter/impl/AnselToUnicode.java
@@ -44,15 +44,22 @@ import org.marc4j.converter.CharConverter;
  */\r
 public class AnselToUnicode extends CharConverter {\r
 \r
+    @SuppressWarnings("rawtypes")\r
     class Queue extends Vector {\r
 \r
         /**\r
+       * \r
+       */\r
+      private static final long serialVersionUID = 7414878465947143461L;\r
+\r
+       /**\r
          * Puts an item into the queue.\r
          * \r
          * @param item\r
          *            the item to be put into the queue.\r
          */\r
-        public Object put(Object item) {\r
+        @SuppressWarnings("unchecked")\r
+       public Object put(Object item) {\r
             addElement(item);\r
 \r
             return item;\r
@@ -63,7 +70,8 @@ public class AnselToUnicode extends CharConverter {
          */\r
         public Object get() {\r
             Object obj;\r
-            int len = size();\r
+            @SuppressWarnings("unused")\r
+           int len = size();\r
 \r
             obj = peek();\r
             removeElementAt(0);\r
@@ -75,7 +83,8 @@ public class AnselToUnicode extends CharConverter {
          * Peeks at the front of the queue.\r
          */\r
         public Object peek() {\r
-            int len = size();\r
+            @SuppressWarnings("unused")\r
+           int len = size();\r
 \r
             return elementAt(0);\r
         }\r
@@ -151,6 +160,7 @@ public class AnselToUnicode extends CharConverter {
     }\r
 \r
 \r
+    @SuppressWarnings({ "rawtypes", "unchecked" })\r
     private CodeTableInterface loadGeneratedTable(boolean loadMultibyte) \r
     {\r
         try\r
@@ -218,7 +228,8 @@ public class AnselToUnicode extends CharConverter {
     private void checkMode(char[] data, CodeTracker cdt) {\r
         int extra = 0;\r
         int extra2 = 0;\r
-        int extra3 = 0;\r
+        @SuppressWarnings("unused")\r
+       int extra3 = 0;\r
         while (cdt.offset + extra + extra2< data.length && isEscape(data[cdt.offset])) {\r
             switch (data[cdt.offset + 1 + extra]) {\r
             case 0x28:  // '('\r
@@ -519,6 +530,7 @@ public class AnselToUnicode extends CharConverter {
         return sb.toString();\r
     }\r
 \r
+    @SuppressWarnings("unused")\r
     private int makeMultibyte(char[] data) {\r
         int[] chars = new int[3];\r
         chars[0] = data[0] << 16;\r

diff --git a/src/org/marc4j/converter/impl/CodeTable.java b/src/org/marc4j/converter/impl/CodeTable.java
index 95c31fe..0973c8c 100644 (file)
--- a/src/org/marc4j/converter/impl/CodeTable.java
+++ b/src/org/marc4j/converter/impl/CodeTable.java
@@ -23,11 +23,8 @@ package org.marc4j.converter.impl;
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.io.InputStream;\r
-import java.io.PrintStream;\r
 import java.net.URI;\r
-import java.util.Arrays;\r
 import java.util.HashMap;\r
-import java.util.Iterator;\r
 import java.util.Vector;\r
 \r
 import javax.xml.parsers.SAXParser;\r
@@ -48,10 +45,13 @@ import org.xml.sax.XMLReader;
  *  \r
  */\r
 public class CodeTable implements CodeTableInterface {\r
+    @SuppressWarnings("rawtypes")\r
     protected static HashMap charsets = null;\r
 \r
+    @SuppressWarnings("rawtypes")\r
     protected static HashMap combining = null;\r
 \r
+    @SuppressWarnings("rawtypes")\r
     public boolean isCombining(int i, int g0, int g1) {\r
         if (i <= 0x7E) {\r
             Vector v = (Vector) combining.get(new Integer(g0));\r
@@ -62,6 +62,7 @@ public class CodeTable implements CodeTableInterface {
         }\r
     }\r
 \r
+    @SuppressWarnings("rawtypes")\r
     public char getChar(int c, int mode) {\r
         if (c == 0x20)\r
             return (char) c;\r

diff --git a/src/org/marc4j/converter/impl/CodeTableGenerator.java b/src/org/marc4j/converter/impl/CodeTableGenerator.java
index bdeb663..023cc55 100644 (file)
--- a/src/org/marc4j/converter/impl/CodeTableGenerator.java
+++ b/src/org/marc4j/converter/impl/CodeTableGenerator.java
@@ -57,6 +57,7 @@ public class CodeTableGenerator extends CodeTable {
         ct.dumpTableAsSwitchStatement(System.out);\r
     }\r
 \r
+    @SuppressWarnings("rawtypes")\r
     private void dumpTableAsSwitchStatement(PrintStream output)\r
     {\r
         output.println("package org.marc4j.converter.impl;");\r
@@ -169,6 +170,7 @@ public class CodeTableGenerator extends CodeTable {
         output.println("}");\r
     }\r
 \r
+    @SuppressWarnings("rawtypes")\r
     private void dumpPartialMultiByteTable(PrintStream output, StringBuffer buffer, Object keyArray[], HashMap map, int startByte, int endByte)\r
     {\r
         String startByteStr = "0x"+Integer.toHexString(startByte);\r

diff --git a/src/org/marc4j/converter/impl/CodeTableHandler.java b/src/org/marc4j/converter/impl/CodeTableHandler.java
index 9b8a371..5662566 100644 (file)
--- a/src/org/marc4j/converter/impl/CodeTableHandler.java
+++ b/src/org/marc4j/converter/impl/CodeTableHandler.java
@@ -47,10 +47,13 @@ import org.xml.sax.helpers.DefaultHandler;
  */\r
 public class CodeTableHandler extends DefaultHandler {\r
 \r
+  @SuppressWarnings("rawtypes")\r
   private HashMap sets;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   private HashMap charset;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   private HashMap combiningchars;\r
 \r
   /** Data element identifier */\r
@@ -64,21 +67,26 @@ public class CodeTableHandler extends DefaultHandler {
 \r
   private boolean iscombining;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   private Vector combining;\r
 \r
   /** Tag name */\r
+  @SuppressWarnings("unused")\r
   private String tag;\r
 \r
   /** StringBuffer to store data */\r
   private StringBuffer data;\r
 \r
   /** Locator object */\r
+  @SuppressWarnings("unused")\r
   private Locator locator;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public HashMap getCharSets() {\r
     return sets;\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public HashMap getCombiningChars() {\r
     return combiningchars;\r
   }\r
@@ -95,6 +103,7 @@ public class CodeTableHandler extends DefaultHandler {
     this.locator = locator;\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public void startElement(String uri, String name, String qName,\r
       Attributes atts) throws SAXParseException {\r
     if (name.equals("characterSet")) {\r
@@ -122,6 +131,7 @@ public class CodeTableHandler extends DefaultHandler {
     }\r
   }\r
 \r
+  @SuppressWarnings("unchecked")\r
   public void endElement(String uri, String name, String qName)\r
       throws SAXParseException {\r
     if (name.equals("characterSet")) {\r
@@ -154,6 +164,7 @@ public class CodeTableHandler extends DefaultHandler {
     data = null;\r
   }\r
 \r
+  @SuppressWarnings({ "unused", "rawtypes" })\r
   public static void main(String[] args) {\r
     HashMap charsets = null;\r
 \r

diff --git a/src/org/marc4j/converter/impl/ReverseCodeTable.java b/src/org/marc4j/converter/impl/ReverseCodeTable.java
index 967eabd..45e6667 100644 (file)
--- a/src/org/marc4j/converter/impl/ReverseCodeTable.java
+++ b/src/org/marc4j/converter/impl/ReverseCodeTable.java
@@ -47,14 +47,17 @@ import org.xml.sax.helpers.DefaultHandler;
  * @see DefaultHandler\r
  */\r
 public class ReverseCodeTable {\r
+  @SuppressWarnings("rawtypes")\r
   protected static Hashtable charset = null;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   protected static Vector combining = null;\r
 \r
   public boolean isCombining(Character c) {\r
     return combining.contains(c);\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public Hashtable codeTableHash(Character c) {\r
     Hashtable chars = (Hashtable) charset.get(c);\r
     if (chars == null) {\r
@@ -64,6 +67,7 @@ public class ReverseCodeTable {
       return chars;\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public static boolean inPreviousCharCodeTable(Character c,\r
       CodeTableTracker ctt) {\r
     Hashtable chars = (Hashtable) charset.get(c);\r
@@ -82,6 +86,7 @@ public class ReverseCodeTable {
     }\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public static char getChar(Character c, CodeTableTracker ctt) {\r
     Hashtable chars = (Hashtable) charset.get(c);\r
 \r

diff --git a/src/org/marc4j/converter/impl/ReverseCodeTableHandler.java b/src/org/marc4j/converter/impl/ReverseCodeTableHandler.java
index 2f7fe5e..7f41646 100644 (file)
--- a/src/org/marc4j/converter/impl/ReverseCodeTableHandler.java
+++ b/src/org/marc4j/converter/impl/ReverseCodeTableHandler.java
@@ -47,8 +47,10 @@ import org.xml.sax.helpers.DefaultHandler;
  * @see DefaultHandler\r
  */\r
 public class ReverseCodeTableHandler extends DefaultHandler {\r
+  @SuppressWarnings("rawtypes")\r
   private Hashtable charset;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   private Vector combiningchars;\r
 \r
   private boolean useAlt = false;\r
@@ -63,18 +65,22 @@ public class ReverseCodeTableHandler extends DefaultHandler {
   private boolean combining;\r
 \r
   /** Tag name */\r
+  @SuppressWarnings("unused")\r
   private String tag;\r
 \r
   /** StringBuffer to store data */\r
   private StringBuffer data;\r
 \r
   /** Locator object */\r
+  @SuppressWarnings("unused")\r
   private Locator locator;\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public Hashtable getCharSets() {\r
     return charset;\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public Vector getCombiningChars() {\r
     return combiningchars;\r
   }\r
@@ -91,6 +97,7 @@ public class ReverseCodeTableHandler extends DefaultHandler {
     this.locator = locator;\r
   }\r
 \r
+  @SuppressWarnings("rawtypes")\r
   public void startElement(String uri, String name, String qName,\r
       Attributes atts) throws SAXParseException {\r
     if (name.equals("characterSet"))\r
@@ -117,6 +124,7 @@ public class ReverseCodeTableHandler extends DefaultHandler {
     }\r
   }\r
 \r
+  @SuppressWarnings({ "unchecked", "rawtypes" })\r
   public void endElement(String uri, String name, String qName)\r
       throws SAXParseException {\r
     if (name.equals("marc")) {\r
@@ -160,6 +168,7 @@ public class ReverseCodeTableHandler extends DefaultHandler {
     data = null;\r
   }\r
 \r
+  @SuppressWarnings({ "rawtypes", "unused" })\r
   public static void main(String[] args) {\r
     Hashtable charsets = null;\r
 \r

diff --git a/src/org/marc4j/converter/impl/UnicodeToAnsel.java b/src/org/marc4j/converter/impl/UnicodeToAnsel.java
index 6c13610..6e2ce5f 100644 (file)
--- a/src/org/marc4j/converter/impl/UnicodeToAnsel.java
+++ b/src/org/marc4j/converter/impl/UnicodeToAnsel.java
@@ -96,11 +96,13 @@ public class UnicodeToAnsel extends CharConverter {
      * @param data - the UCS/Unicode data in an array of char\r
      * @return String - the MARC-8 data\r
      */\r
+    @SuppressWarnings("rawtypes")\r
     public String convert(char data[]) {\r
         StringBuffer sb = new StringBuffer();\r
         CodeTableTracker ctt = new CodeTableTracker();\r
 \r
-        boolean technique1 = false;\r
+        @SuppressWarnings("unused")\r
+       boolean technique1 = false;\r
 \r
         for (int i = 0; i < data.length; i++) {\r
             Character c = new Character(data[i]);\r

diff --git a/src/org/marc4j/marc/DataField.java b/src/org/marc4j/marc/DataField.java
index 146cb90..3af95f0 100644 (file)
--- a/src/org/marc4j/marc/DataField.java
+++ b/src/org/marc4j/marc/DataField.java
@@ -65,7 +65,7 @@ public interface DataField extends VariableField {
         * \r
         * @return List - the list of <code>Subfield</code> objects\r
         */\r
-       public List getSubfields();\r
+       public List<Subfield> getSubfields();\r
 \r
        /**\r
         * Returns the list of <code>Subfield</code> objects for the goven\r
@@ -75,7 +75,7 @@ public interface DataField extends VariableField {
         *            the subfield code\r
         * @return List - the list of <code>Subfield</code> objects\r
         */\r
-       public List getSubfields(char code);\r
+       public List<Subfield> getSubfields(char code);\r
 \r
        /**\r
         * Returns the first <code>Subfield</code> with the given code.\r

diff --git a/src/org/marc4j/marc/IllegalAddException.java b/src/org/marc4j/marc/IllegalAddException.java
index f0c5738..73a6a31 100644 (file)
--- a/src/org/marc4j/marc/IllegalAddException.java
+++ b/src/org/marc4j/marc/IllegalAddException.java
@@ -30,6 +30,11 @@ public class IllegalAddException
     extends IllegalArgumentException {\r
 \r
     /**\r
+   * \r
+   */\r
+  private static final long serialVersionUID = 8756226018321264604L;\r
+\r
+    /**\r
      * Creates a new <code>Exception</code> indicating that the addttion\r
      * of the supplied object is illegal.\r
      *\r

diff --git a/src/org/marc4j/marc/MarcFactory.java b/src/org/marc4j/marc/MarcFactory.java
index 2e87341..43d30f6 100644 (file)
--- a/src/org/marc4j/marc/MarcFactory.java
+++ b/src/org/marc4j/marc/MarcFactory.java
@@ -75,7 +75,8 @@ public abstract class MarcFactory {
       className = getFactoryClassName(loader, count++);\r
       if (className != null) {\r
         try {\r
-          Class t = (loader != null) ? loader.loadClass(className) : Class\r
+          @SuppressWarnings("rawtypes")\r
+         Class t = (loader != null) ? loader.loadClass(className) : Class\r
               .forName(className);\r
           return (MarcFactory) t.newInstance();\r
         } catch (ClassNotFoundException e) {\r

diff --git a/src/org/marc4j/marc/Record.java b/src/org/marc4j/marc/Record.java
index 62b5aca..a4453fb 100644 (file)
--- a/src/org/marc4j/marc/Record.java
+++ b/src/org/marc4j/marc/Record.java
@@ -90,21 +90,21 @@ public interface Record extends Serializable {
      * \r
      * @return List - the variable fields\r
      */\r
-    public List getVariableFields();\r
+    public List<VariableField> getVariableFields();\r
 \r
     /**\r
      * Returns a list of control fields\r
      * \r
      * @return List - the control fields\r
      */\r
-    public List getControlFields();\r
+    public List<ControlField> getControlFields();\r
 \r
     /**\r
      * Returns a list of data fields\r
      * \r
      * @return List - the data fields\r
      */\r
-    public List getDataFields();\r
+    public List<DataField> getDataFields();\r
 \r
     /**\r
      * Returns the control number field or <code>null</code> if no control\r
@@ -137,7 +137,7 @@ public interface Record extends Serializable {
      * \r
      * @return List - the variable fields\r
      */\r
-    public List getVariableFields(String tag);\r
+    public List<VariableField> getVariableFields(String tag);\r
 \r
     /**\r
      * Returns a list of variable fields for the given tags.\r
@@ -153,7 +153,7 @@ public interface Record extends Serializable {
      * \r
      * @return List - the variable fields\r
      */\r
-    public List getVariableFields(String[] tag);\r
+    public List<VariableField> getVariableFields(String[] tag);\r
 \r
     /**\r
      * Returns the <code>Leader</code>.\r
@@ -183,7 +183,7 @@ public interface Record extends Serializable {
      *            the regular expression\r
      * @return List - the result list\r
      */\r
-    public List find(String pattern);\r
+    public List<VariableField> find(String pattern);\r
 \r
     /**\r
      * Returns a List of VariableField objects with the given tag that have a\r
@@ -200,7 +200,7 @@ public interface Record extends Serializable {
      *            the regular expression\r
      * @return List - the result list\r
      */\r
-    public List find(String tag, String pattern);\r
+    public List<VariableField> find(String tag, String pattern);\r
 \r
     /**\r
      * Returns a List of VariableField objects with the given tags that have a\r
@@ -217,6 +217,6 @@ public interface Record extends Serializable {
      *            the regular expression\r
      * @return List - the result list\r
      */\r
-    public List find(String[] tag, String pattern);\r
+    public List<VariableField> find(String[] tag, String pattern);\r
 \r
 }
\ No newline at end of file

diff --git a/src/org/marc4j/marc/VariableField.java b/src/org/marc4j/marc/VariableField.java
index 5320179..3aebaf2 100644 (file)
--- a/src/org/marc4j/marc/VariableField.java
+++ b/src/org/marc4j/marc/VariableField.java
@@ -22,14 +22,13 @@ package org.marc4j.marc;
 \r
 import java.io.Serializable;\r
 \r
-import org.marc4j.marc.impl.VariableFieldImpl;\r
-\r
 /**\r
  * Represents a variable field in a MARC record.\r
  * \r
  * @author Bas Peters\r
  * @version $Revision: 1.10 $\r
  */\r
+@SuppressWarnings("rawtypes")\r
 public interface VariableField extends Serializable, Comparable {\r
 \r
     /**\r

diff --git a/src/org/marc4j/marc/impl/ControlFieldImpl.java b/src/org/marc4j/marc/impl/ControlFieldImpl.java
index 2d0a93e..ea06d1a 100644 (file)
--- a/src/org/marc4j/marc/impl/ControlFieldImpl.java
+++ b/src/org/marc4j/marc/impl/ControlFieldImpl.java
@@ -33,6 +33,11 @@ import org.marc4j.marc.ControlField;
  */\r
 public class ControlFieldImpl extends VariableFieldImpl implements ControlField {\r
 \r
+    /**\r
+   * \r
+   */\r
+  private static final long serialVersionUID = 8072900114616013850L;\r
+\r
     private Long id;\r
     \r
     private String data;\r

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

diff --git a/src/org/marc4j/marc/impl/LeaderImpl.java b/src/org/marc4j/marc/impl/LeaderImpl.java
index 56db8cf..0534ead 100644 (file)
--- a/src/org/marc4j/marc/impl/LeaderImpl.java
+++ b/src/org/marc4j/marc/impl/LeaderImpl.java
@@ -33,6 +33,11 @@ import org.marc4j.marc.Leader;
  */\r
 public class LeaderImpl implements Leader {\r
 \r
+    /**\r
+     * \r
+    */\r
+    private static final long serialVersionUID = 6483942612907658766L;\r
+\r
     private Long id;\r
 \r
     /** The logical record length (Position 0-4). */\r

diff --git a/src/org/marc4j/marc/impl/RecordImpl.java b/src/org/marc4j/marc/impl/RecordImpl.java
index b6b8a8c..ceb6249 100644 (file)
--- a/src/org/marc4j/marc/impl/RecordImpl.java
+++ b/src/org/marc4j/marc/impl/RecordImpl.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;\r
 \r
 import org.marc4j.marc.ControlField;\r
+import org.marc4j.marc.DataField;\r
 import org.marc4j.marc.IllegalAddException;\r
 import org.marc4j.marc.Leader;\r
 import org.marc4j.marc.Record;\r
@@ -39,13 +40,18 @@ import org.marc4j.marc.VariableField;
  */\r
 public class RecordImpl implements Record {\r
 \r
+    /**\r
+     * \r
+     */\r
+    private static final long serialVersionUID = 1906886225329068668L;\r
+\r
     private Long id;\r
 \r
     private Leader leader;\r
 \r
-    private List controlFields;\r
+    private List<ControlField> controlFields;\r
 \r
-    private List dataFields;\r
+    private List<DataField> dataFields;\r
 \r
     private String type;\r
 \r
@@ -53,8 +59,8 @@ public class RecordImpl implements Record {
      * Creates a new <code>Record</code>.\r
      */\r
     public RecordImpl() {\r
-        controlFields = new ArrayList();\r
-        dataFields = new ArrayList();\r
+        controlFields = new ArrayList<ControlField>();\r
+        dataFields = new ArrayList<DataField>();\r
     }\r
 \r
     public void setType(String type) {\r
@@ -87,6 +93,7 @@ public class RecordImpl implements Record {
      *             when the parameter is not a <code>VariableField</code>\r
      *             instance\r
      */\r
+    @SuppressWarnings("unchecked")\r
     public void addVariableField(VariableField field) {\r
         if (!(field instanceof VariableField))\r
             throw new IllegalAddException("Expected VariableField instance");\r
@@ -94,15 +101,16 @@ public class RecordImpl implements Record {
         String tag = field.getTag();\r
         if (Verifier.isControlNumberField(tag)) {\r
             if (Verifier.hasControlNumberField(controlFields))\r
-                controlFields.set(0, field);\r
+              // TODO create converter from VariableField to ControlField\r
+              controlFields.set(0, ((ControlField) field));\r
             else\r
-                controlFields.add(0, field);\r
+                controlFields.add(0, ((ControlField) field));\r
             Collections.sort(controlFields);\r
         } else if (Verifier.isControlField(tag)) {\r
-            controlFields.add(field);\r
+            controlFields.add(((ControlField) field));\r
             Collections.sort(controlFields);\r
         } else {\r
-            dataFields.add(field);\r
+            dataFields.add(((DataField) field));\r
             Collections.sort(dataFields);\r
         }\r
 \r
@@ -129,16 +137,17 @@ public class RecordImpl implements Record {
             return null;\r
     }\r
 \r
-    public List getControlFields() {\r
+    public List<ControlField> getControlFields() {\r
         return controlFields;\r
     }\r
 \r
-    public List getDataFields() {\r
+    public List<DataField> getDataFields() {\r
         return dataFields;\r
     }\r
 \r
     public VariableField getVariableField(String tag) {\r
-        Iterator i;\r
+        @SuppressWarnings("rawtypes")\r
+       Iterator i;\r
         if (Verifier.isControlField(tag))\r
             i = controlFields.iterator();\r
         else\r
@@ -151,9 +160,10 @@ public class RecordImpl implements Record {
         return null;\r
     }\r
 \r
-    public List getVariableFields(String tag) {\r
-        List fields = new ArrayList();\r
-        Iterator i;\r
+    public List<VariableField> getVariableFields(String tag) {\r
+        List<VariableField> fields = new ArrayList<VariableField>();\r
+        @SuppressWarnings("rawtypes")\r
+       Iterator i;\r
         if (Verifier.isControlField(tag))\r
             i = controlFields.iterator();\r
         else\r
@@ -166,15 +176,16 @@ public class RecordImpl implements Record {
         return fields;\r
     }\r
 \r
-    public List getVariableFields() {\r
-        List fields = new ArrayList();\r
-        Iterator i;\r
-        i = controlFields.iterator();\r
+    @SuppressWarnings("rawtypes")\r
+    public List<VariableField> getVariableFields() {\r
+        List<VariableField> fields = new ArrayList<VariableField>();\r
+       Iterator i;\r
+        i = ((List) controlFields).iterator();\r
         while (i.hasNext())\r
-            fields.add(i.next());\r
+            fields.add((VariableField) i.next());\r
         i = dataFields.iterator();\r
         while (i.hasNext())\r
-            fields.add(i.next());\r
+            fields.add((VariableField) i.next());\r
         return fields;\r
     }\r
 \r
@@ -184,7 +195,8 @@ public class RecordImpl implements Record {
         return(result);\r
     }\r
 \r
-    public List getVariableFields(String[] tags) {\r
+    @SuppressWarnings({ "rawtypes", "unchecked" })\r
+    public List<VariableField> getVariableFields(String[] tags) {\r
         List list = new ArrayList();\r
         for (int i = 0; i < tags.length; i++) {\r
             String tag = tags[i];\r
@@ -228,7 +240,8 @@ public class RecordImpl implements Record {
         sb.append("LEADER ");\r
         sb.append(getLeader().toString());\r
         sb.append('\n');\r
-        Iterator i = getVariableFields().iterator();\r
+        @SuppressWarnings("rawtypes")\r
+       Iterator i = getVariableFields().iterator();\r
         while (i.hasNext()) {\r
             VariableField field = (VariableField) i.next();\r
             sb.append(field.toString());\r
@@ -237,9 +250,12 @@ public class RecordImpl implements Record {
         return sb.toString();\r
     }\r
 \r
-    public List find(String pattern) {\r
-        List result = new ArrayList();\r
-        Iterator i = controlFields.iterator();\r
+    @SuppressWarnings("unchecked")\r
+    public List<VariableField> find(String pattern) {\r
+        @SuppressWarnings("rawtypes")\r
+       List result = new ArrayList();\r
+        @SuppressWarnings("rawtypes")\r
+       Iterator i = controlFields.iterator();\r
         while (i.hasNext()) {\r
             VariableField field = (VariableField) i.next();\r
             if (field.find(pattern))\r
@@ -254,7 +270,8 @@ public class RecordImpl implements Record {
         return result;\r
     }\r
 \r
-    public List find(String tag, String pattern) {\r
+    @SuppressWarnings({ "unchecked", "rawtypes" })\r
+    public List<VariableField> find(String tag, String pattern) {\r
         List result = new ArrayList();\r
         Iterator i = getVariableFields(tag).iterator();\r
         while (i.hasNext()) {\r
@@ -265,7 +282,8 @@ public class RecordImpl implements Record {
         return result;\r
     }\r
 \r
-    public List find(String[] tag, String pattern) {\r
+    @SuppressWarnings({ "rawtypes", "unchecked" })\r
+    public List<VariableField> find(String[] tag, String pattern) {\r
         List result = new ArrayList();\r
         Iterator i = getVariableFields(tag).iterator();\r
         while (i.hasNext()) {\r

diff --git a/src/org/marc4j/marc/impl/SubfieldImpl.java b/src/org/marc4j/marc/impl/SubfieldImpl.java
index 4428e5b..c5db0a2 100644 (file)
--- a/src/org/marc4j/marc/impl/SubfieldImpl.java
+++ b/src/org/marc4j/marc/impl/SubfieldImpl.java
@@ -33,6 +33,11 @@ import org.marc4j.marc.Subfield;
  */\r
 public class SubfieldImpl implements Subfield {\r
 \r
+    /**\r
+     *  \r
+     */\r
+    private static final long serialVersionUID = -5652216007819993017L;\r
+\r
     private Long id;\r
     \r
     private char code;\r

diff --git a/src/org/marc4j/marc/impl/VariableFieldImpl.java b/src/org/marc4j/marc/impl/VariableFieldImpl.java
index b0deb05..6265166 100644 (file)
--- a/src/org/marc4j/marc/impl/VariableFieldImpl.java
+++ b/src/org/marc4j/marc/impl/VariableFieldImpl.java
@@ -30,6 +30,10 @@ import org.marc4j.marc.VariableField;
  */\r
 public abstract class VariableFieldImpl implements VariableField {\r
 \r
+    /**\r
+     * \r
+     */\r
+    private static final long serialVersionUID = -1946945669891526509L;\r
     private String tag;\r
 \r
     /**\r

diff --git a/src/org/marc4j/marc/impl/Verifier.java b/src/org/marc4j/marc/impl/Verifier.java
index 199a668..0f1211b 100644 (file)
--- a/src/org/marc4j/marc/impl/Verifier.java
+++ b/src/org/marc4j/marc/impl/Verifier.java
@@ -62,7 +62,8 @@ public class Verifier {
    * @param col\r
    *          the collection of <code>ControlField</code> objects.\r
    */\r
-  public static boolean hasControlNumberField(Collection col) {\r
+  public static boolean hasControlNumberField(@SuppressWarnings("rawtypes") Collection col) {\r
+    @SuppressWarnings("rawtypes")\r
     Iterator i = col.iterator();\r
     while (i.hasNext()) {\r
       ControlField field = (ControlField) i.next();\r

diff --git a/src/org/marc4j/samples/CheckAgencyExample.java b/src/org/marc4j/samples/CheckAgencyExample.java
index e8d2d7b..bfaab39 100644 (file)
--- a/src/org/marc4j/samples/CheckAgencyExample.java
+++ b/src/org/marc4j/samples/CheckAgencyExample.java
@@ -27,6 +27,7 @@ import org.marc4j.MarcReader;
 import org.marc4j.MarcStreamReader;\r
 import org.marc4j.marc.DataField;\r
 import org.marc4j.marc.Record;\r
+import org.marc4j.marc.VariableField;\r
 \r
 /**\r
  * Demostrates the use of the find method.\r
@@ -46,7 +47,7 @@ public class CheckAgencyExample {
             Record record = reader.next();\r
 \r
             // check if the cataloging agency is DLC\r
-            List result = record.find("040", "DLC");\r
+            List<VariableField> result = record.find("040", "DLC");\r
             if (result.size() > 0)\r
                 System.out.println("Agency for this record is DLC");\r
 \r

diff --git a/src/org/marc4j/samples/DataFieldExample.java b/src/org/marc4j/samples/DataFieldExample.java
index ee518f2..713b2a0 100644 (file)
--- a/src/org/marc4j/samples/DataFieldExample.java
+++ b/src/org/marc4j/samples/DataFieldExample.java
@@ -29,6 +29,7 @@ import org.marc4j.MarcStreamReader;
 import org.marc4j.marc.DataField;\r
 import org.marc4j.marc.Record;\r
 import org.marc4j.marc.Subfield;\r
+import org.marc4j.marc.VariableField;\r
 \r
 /**\r
  * Read data fields.\r
@@ -52,21 +53,24 @@ public class DataFieldExample {
             System.out.println(dataField.toString() + '\n');\r
 \r
             // get all occurences for a particular tag\r
-            List dataFields = record.getVariableFields("650");\r
-            Iterator i = dataFields.iterator();\r
-            while (i.hasNext()) {\r
-                dataField = (DataField) i.next();\r
-                System.out.println(dataField.toString());\r
+            List<VariableField> variableFields = record.getVariableFields("650");\r
+            Iterator<VariableField> vi = variableFields.iterator();\r
+            while (vi.hasNext()) {\r
+               VariableField variableField = vi.next();\r
+                System.out.println(variableField.toString());\r
             }\r
             System.out.print('\n');\r
 \r
             // get all occurences for a given list of tags\r
             String[] tags = { "010", "100", "245", "250", "260", "300" };\r
-            dataFields = record.getVariableFields(tags);\r
-            i = dataFields.iterator();\r
-            while (i.hasNext()) {\r
-                dataField = (DataField) i.next();\r
-                System.out.println(dataField.toString());\r
+            variableFields = record.getVariableFields(tags);\r
+            vi = variableFields.iterator();\r
+            while (vi.hasNext()) {\r
+                VariableField vf = (DataField) vi.next();\r
+                if (vf instanceof DataField)\r
+                  System.out.println( ((DataField) vf).toString());\r
+                else\r
+                 System.err.println("Not a Datafield: " + vf.toString());\r
             }\r
             System.out.print('\n');\r
 \r
@@ -79,11 +83,11 @@ public class DataFieldExample {
             System.out.println("Tag: " + tag + " Indicator 1: " + ind1\r
                     + " Indicator 2: " + ind2);\r
 \r
-            List subfields = dataField.getSubfields();\r
-            i = subfields.iterator();\r
+            List<Subfield> subfields = dataField.getSubfields();\r
+            Iterator<Subfield> si = subfields.iterator();\r
 \r
-            while (i.hasNext()) {\r
-                Subfield subfield = (Subfield) i.next();\r
+            while (si.hasNext()) {\r
+                Subfield subfield = si.next();\r
                 char code = subfield.getCode();\r
                 String data = subfield.getData();\r
 \r

diff --git a/src/org/marc4j/samples/PermissiveReaderExample.java b/src/org/marc4j/samples/PermissiveReaderExample.java
index 57f1eb1..f986cfe 100644 (file)
--- a/src/org/marc4j/samples/PermissiveReaderExample.java
+++ b/src/org/marc4j/samples/PermissiveReaderExample.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.List;\r
 \r
 import org.marc4j.ErrorHandler;\r
+import org.marc4j.ErrorHandler.Error;\r
 import org.marc4j.MarcException;\r
 import org.marc4j.MarcPermissiveStreamReader;\r
 import org.marc4j.MarcReader;\r
@@ -207,13 +208,12 @@ public class PermissiveReaderExample
 \r
     }\r
     \r
-    @SuppressWarnings("unchecked")\r
        public static void dumpErrors(PrintStream out, ErrorHandler errorHandler)\r
     {\r
-        List<Object> errors = errorHandler.getErrors();\r
+        List<Error> errors = errorHandler.getErrors();\r
         if (errors != null) \r
         {\r
-            Iterator<Object> iter = errors.iterator();\r
+            Iterator<Error> iter = errors.iterator();\r
             while (iter.hasNext())\r
             {\r
                 Object error = iter.next();\r

diff --git a/src/org/marc4j/samples/RemoveLocalFieldsExample.java b/src/org/marc4j/samples/RemoveLocalFieldsExample.java
index aea44c3..6547d83 100644 (file)
--- a/src/org/marc4j/samples/RemoveLocalFieldsExample.java
+++ b/src/org/marc4j/samples/RemoveLocalFieldsExample.java
@@ -51,9 +51,9 @@ public class RemoveLocalFieldsExample {
 \r
             Pattern pattern = Pattern.compile("9\\d\\d");\r
 \r
-            List fields = record.getDataFields();\r
+            List<DataField> fields = record.getDataFields();\r
 \r
-            Iterator i = fields.iterator();\r
+            Iterator<DataField> i = fields.iterator();\r
             while (i.hasNext()) {\r
                 DataField field = (DataField) i.next();\r
                 Matcher matcher = pattern.matcher(field.getTag());\r

diff --git a/src/org/marc4j/samples/TagAnalysisExample.java b/src/org/marc4j/samples/TagAnalysisExample.java
index b31a77e..2c651b8 100644 (file)
--- a/src/org/marc4j/samples/TagAnalysisExample.java
+++ b/src/org/marc4j/samples/TagAnalysisExample.java
@@ -26,7 +26,7 @@ public class TagAnalysisExample {
         InputStream input = AddLocationExample.class\r
                 .getResourceAsStream("resources/chabon.mrc");\r
 \r
-        Hashtable table = new Hashtable();\r
+        Hashtable<String, Integer> table = new Hashtable<String, Integer>();\r
 \r
         int counter = 0;\r
 \r
@@ -36,8 +36,8 @@ public class TagAnalysisExample {
 \r
             Record record = reader.next();\r
 \r
-            List fields = record.getVariableFields();\r
-            Iterator i = fields.iterator();\r
+            List<VariableField> fields = record.getVariableFields();\r
+            Iterator<VariableField> i = fields.iterator();\r
             while (i.hasNext()) {\r
                 VariableField field = (VariableField) i.next();\r
                 String tag = field.getTag();\r
@@ -54,9 +54,9 @@ public class TagAnalysisExample {
         System.out.println("Analyzed " + counter + " records");\r
         System.out.println("Tag\tCount");\r
 \r
-        List list = new ArrayList(table.keySet());\r
+        List<String> list = new ArrayList<String>(table.keySet());\r
         Collections.sort(list);\r
-        Iterator i = list.iterator();\r
+        Iterator<String> i = list.iterator();\r
         while (i.hasNext()) {\r
             String tag = (String) i.next();\r
             Integer value = (Integer) table.get(tag);\r

diff --git a/src/org/marc4j/samples/XercesSerializerExample.java b/src/org/marc4j/samples/XercesSerializerExample.java
index a2a025c..79aee41 100644 (file)
--- a/src/org/marc4j/samples/XercesSerializerExample.java
+++ b/src/org/marc4j/samples/XercesSerializerExample.java
@@ -22,15 +22,8 @@ package org.marc4j.samples;
 \r
 import java.io.InputStream;\r
 \r
-import javax.xml.transform.Result;\r
-import javax.xml.transform.sax.SAXResult;\r
-\r
-// import org.apache.xml.serialize.OutputFormat;\r
-// import org.apache.xml.serialize.XMLSerializer;\r
 import org.marc4j.MarcReader;\r
 import org.marc4j.MarcStreamReader;\r
-import org.marc4j.MarcXmlWriter;\r
-import org.marc4j.converter.impl.AnselToUnicode;\r
 import org.marc4j.marc.Record;\r
 \r
 /**\r
@@ -58,7 +51,8 @@ public class XercesSerializerExample {
         // MarcXmlWriter writer = new MarcXmlWriter(result);\r
         // writer.setConverter(new AnselToUnicode());\r
         while (reader.hasNext()) {\r
-            Record record = reader.next();\r
+            @SuppressWarnings("unused")\r
+           Record record = reader.next();\r
             // writer.write(record);\r
         }\r
         // writer.close();\r

diff --git a/src/org/marc4j/test/ControlFieldTest.java b/src/org/marc4j/test/ControlFieldTest.java
index a1c9bf7..f146737 100644 (file)
--- a/src/org/marc4j/test/ControlFieldTest.java
+++ b/src/org/marc4j/test/ControlFieldTest.java
@@ -28,6 +28,7 @@ public class ControlFieldTest extends TestCase {
            assertEquals("12883376", cf.getData());\r
        }\r
     \r
+    @SuppressWarnings("unchecked")\r
     public void testComparable() throws Exception {\r
         ControlField cf1 = factory.newControlField("008", "12345");\r
         ControlField cf2 = factory.newControlField("008", "12345");\r

diff --git a/src/org/marc4j/test/DataFieldTest.java b/src/org/marc4j/test/DataFieldTest.java
index 904b803..1018ed1 100644 (file)
--- a/src/org/marc4j/test/DataFieldTest.java
+++ b/src/org/marc4j/test/DataFieldTest.java
@@ -42,6 +42,7 @@ public class DataFieldTest extends TestCase {
         assertEquals('a', s.getCode());\r
     }\r
 \r
+    @SuppressWarnings("unchecked")\r
     public void testComparable() throws Exception {\r
         DataField df1 = factory.newDataField("600", '0', '0');\r
         DataField df2 = factory.newDataField("600", '0', '0');\r

diff --git a/src/org/marc4j/test/RecordTest.java b/src/org/marc4j/test/RecordTest.java
index 7e44545..f78e05e 100644 (file)
--- a/src/org/marc4j/test/RecordTest.java
+++ b/src/org/marc4j/test/RecordTest.java
@@ -38,14 +38,14 @@ public class RecordTest extends TestCase {
         assertEquals("001", cf.getTag());\r
         assertEquals("12883376", cf.getData());\r
 \r
-        List fieldList = record.getVariableFields();\r
+        List<VariableField> fieldList = record.getVariableFields();\r
         assertEquals(15, fieldList.size());\r
 \r
-        fieldList = record.getControlFields();\r
-        assertEquals(3, fieldList.size());\r
+        List<ControlField> controlList = record.getControlFields();\r
+        assertEquals(3, controlList.size());\r
 \r
-        fieldList = record.getDataFields();\r
-        assertEquals(12, fieldList.size());\r
+        List<DataField> dataList = record.getDataFields();\r
+        assertEquals(12, dataList.size());\r
 \r
         VariableField field = record.getVariableField("245");\r
         assertEquals("245", field.getTag());\r
@@ -58,6 +58,7 @@ public class RecordTest extends TestCase {
         assertEquals(3, fieldList.size());\r
     }\r
 \r
+    @SuppressWarnings("rawtypes")\r
     public void testFind() throws Exception {\r
         VariableField field = record.getVariableField("245");\r
         assertEquals(true, field.find("Summerland"));\r

diff --git a/src/org/marc4j/test/RoundtripTest.java b/src/org/marc4j/test/RoundtripTest.java
index b1f30f6..c53cbf5 100644 (file)
--- a/src/org/marc4j/test/RoundtripTest.java
+++ b/src/org/marc4j/test/RoundtripTest.java
@@ -42,7 +42,8 @@ public class RoundtripTest extends TestCase {
 \r
         reader = new MarcStreamReader(input);\r
         while (reader.hasNext()) {\r
-            Record record = reader.next();\r
+            @SuppressWarnings("unused")\r
+           Record record = reader.next();\r
             counter++;\r
         }\r
         input.close();\r
@@ -77,7 +78,8 @@ public class RoundtripTest extends TestCase {
         reader = new MarcStreamReader(input, "UTF8");\r
 \r
         while (reader.hasNext()) {\r
-            Record record = reader.next();\r
+            @SuppressWarnings("unused")\r
+           Record record = reader.next();\r
             counter++;\r
         }\r
         input.close();\r