Make List type safe. Remove/suppress all warnings.

[marc4j.git] / src / org / marc4j / MarcXmlWriter.java

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