Add type-safe parameters to collections; replace XGC jar to benefit from new type-safe methods

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1055034 13f79535-47bb-0310-9956-ffa450edef68

examples/plan/src/org/apache/fop/plan/PlanElementMapping.java

@@ -45,7 +45,7 @@ public class PlanElementMapping extends ElementMapping {
     /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new java.util.HashMap();
+            foObjs = new java.util.HashMap<String, Maker>();
             foObjs.put("plan", new PE());
             foObjs.put(DEFAULT, new PlanMaker());
         }

src/java/org/apache/fop/fo/ElementMapping.java

@@ -19,7 +19,7 @@
 
 package org.apache.fop.fo;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -30,7 +30,7 @@ import org.apache.xmlgraphics.util.QName;
 
 /**
  * Abstract base class for Element Mappings (including FO Element Mappings)
- * which provide the framework of valid elements and attibutes for a given
+ * which provide the framework of valid elements and attributes for a given
  * namespace.
  */
 public abstract class ElementMapping {
@@ -38,7 +38,7 @@ public abstract class ElementMapping {
     public static final String DEFAULT = "<default>";
 
     /** The HashMap table of formatting objects defined by the ElementMapping */
-    protected HashMap foObjs = null;
+    protected Map<String, Maker> foObjs = null;
     //Please don't change that to java.util.Map as that can break extensions.
 
     /** The namespace for the ElementMapping */
@@ -49,7 +49,7 @@ public abstract class ElementMapping {
      *
      * @return Table of Maker objects for this ElementMapping
      */
-    public HashMap getTable() {
+    public Map<String, Maker> getTable() {
         if (foObjs == null) {
             initialize();
         }

src/java/org/apache/fop/fo/ElementMappingRegistry.java

@@ -48,12 +48,14 @@ public class ElementMappingRegistry {
      * Table mapping element names to the makers of objects
      * representing formatting objects.
      */
-    protected Map fobjTable = new java.util.HashMap();
+    protected Map<String, Map<String, Maker>> fobjTable
+    = new java.util.HashMap<String, Map<String, Maker>>();
 
     /**
      * Map of mapped namespaces and their associated ElementMapping instances.
      */
-    protected Map namespaces = new java.util.HashMap();
+    protected Map<String, ElementMapping> namespaces
+    = new java.util.HashMap<String, ElementMapping>();
 
     /**
      * Main constructor. Adds all default element mapping as well as detects ElementMapping
@@ -70,10 +72,10 @@ public class ElementMappingRegistry {
      */
     private void setupDefaultMappings() {
         // add mappings from available services
-        Iterator providers = Service.providers(ElementMapping.class, false);
+        Iterator<String> providers = Service.providerNames(ElementMapping.class);
         if (providers != null) {
             while (providers.hasNext()) {
-                String mapping = (String)providers.next();
+                String mapping = providers.next();
                 try {
                     addElementMapping(mapping);
                 } catch (IllegalArgumentException e) {
@@ -129,13 +131,13 @@ public class ElementMappingRegistry {
      */
     public Maker findFOMaker(String namespaceURI, String localName, Locator locator)
                 throws FOPException {
-        Map table = (Map)fobjTable.get(namespaceURI);
+        Map<String, Maker> table = fobjTable.get(namespaceURI);
         Maker fobjMaker = null;
         if (table != null) {
-            fobjMaker = (Maker)table.get(localName);
+            fobjMaker = table.get(localName);
             // try default
             if (fobjMaker == null) {
-                fobjMaker = (Maker)table.get(ElementMapping.DEFAULT);
+                fobjMaker = table.get(ElementMapping.DEFAULT);
             }
         }
 

src/java/org/apache/fop/fo/FOElementMapping.java

@@ -44,7 +44,7 @@ public class FOElementMapping extends ElementMapping {
      */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
 
             // Declarations and Pagination and Layout Formatting Objects
             foObjs.put("root", new RootMaker());

src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java

@@ -37,8 +37,8 @@ public class ExtensionElementMapping extends ElementMapping {
     /** The FOP extension namespace URI */
     public static final String URI = "http://xmlgraphics.apache.org/fop/extensions";
 
-    private static final Set PROPERTY_ATTRIBUTES
-        = new java.util.HashSet();
+    private static final Set<String> PROPERTY_ATTRIBUTES
+        = new java.util.HashSet<String>();
 
     static {
         //These are FOP's standard extension properties (fox:*)
@@ -63,7 +63,7 @@ public class ExtensionElementMapping extends ElementMapping {
      */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
             foObjs.put("outline", new UnknownXMLObj.Maker(URI));
             foObjs.put("label", new UnknownXMLObj.Maker(URI));
             foObjs.put("destination", new DestinationMaker());

src/java/org/apache/fop/fo/extensions/InternalElementMapping.java

@@ -34,7 +34,7 @@ public class InternalElementMapping extends ElementMapping {
     /** The FOP extension namespace URI */
     public static final String URI = "http://xmlgraphics.apache.org/fop/internal";
 
-    private static final Set PROPERTY_ATTRIBUTES = new java.util.HashSet();
+    private static final Set<String> PROPERTY_ATTRIBUTES = new java.util.HashSet<String>();
 
     static {
         //These are FOP's extension properties for accessibility
@@ -53,7 +53,7 @@ public class InternalElementMapping extends ElementMapping {
      */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
         }
     }
 

src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java

@@ -44,7 +44,7 @@ public class OldExtensionElementMapping extends ElementMapping {
      */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
             foObjs.put("outline", new UnknownXMLObj.Maker(URI));
             foObjs.put("label", new UnknownXMLObj.Maker(URI));
         }

src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java

@@ -73,7 +73,7 @@ public class BatikExtensionElementMapping extends ElementMapping {
                 XMLResourceDescriptor.setXMLParserClassName(
                   getAParserClassName());
 
-                foObjs = new HashMap();
+                foObjs = new HashMap<String, Maker>();
                 foObjs.put("batik", new SE());
                 foObjs.put(DEFAULT, new SVGMaker());
             } catch (Throwable t) {

src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java

@@ -80,7 +80,7 @@ public class SVGElementMapping extends ElementMapping {
                 XMLResourceDescriptor.setXMLParserClassName(
                   getAParserClassName());
 
-                foObjs = new HashMap();
+                foObjs = new HashMap<String, Maker>();
                 foObjs.put("svg", new SE());
                 foObjs.put(DEFAULT, new SVGMaker());
             } catch (Throwable t) {

src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java

@@ -45,7 +45,7 @@ public class RDFElementMapping extends ElementMapping {
     /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
             foObjs.put("RDF", new RDFElementMaker());
         }
     }

src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java

@@ -45,7 +45,7 @@ public class XMPElementMapping extends ElementMapping {
     /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
             foObjs.put("xmpmeta", new XMPMetaElementMaker());
         }
     }

src/java/org/apache/fop/render/XMLHandlerRegistry.java

@@ -39,7 +39,8 @@ public class XMLHandlerRegistry {
     private static Log log = LogFactory.getLog(XMLHandlerRegistry.class);
 
     /** Map containing XML handlers for various document types */
-    private Map handlers = new java.util.HashMap();
+    private Map<String, List<XMLHandler>> handlers
+    = new java.util.HashMap<String, List<XMLHandler>>();
 
     /**
      * Default constructor.
@@ -98,11 +99,10 @@ public class XMLHandlerRegistry {
      * @param ns Namespace URI
      * @param handler XMLHandler to use
      */
-    private void addXMLHandler(String ns,
-                              XMLHandler handler) {
-        List lst = (List)handlers.get(ns);
+    private void addXMLHandler(String ns, XMLHandler handler) {
+        List<XMLHandler> lst = handlers.get(ns);
         if (lst == null) {
-            lst = new java.util.ArrayList();
+            lst = new java.util.ArrayList<XMLHandler>();
             handlers.put(ns, lst);
         }
         lst.add(handler);
@@ -118,21 +118,21 @@ public class XMLHandlerRegistry {
     public XMLHandler getXMLHandler(Renderer renderer, String ns) {
         XMLHandler handler;
 
-        List lst = (List)handlers.get(ns);
+        List<XMLHandler> lst = handlers.get(ns);
         handler = getXMLHandler(renderer, lst);
         if (handler == null) {
-            lst = (List)handlers.get(XMLHandler.HANDLE_ALL);
+            lst = handlers.get(XMLHandler.HANDLE_ALL);
             handler = getXMLHandler(renderer, lst);
         }
         return handler;
     }
 
-    private XMLHandler getXMLHandler(Renderer renderer, List lst) {
+    private XMLHandler getXMLHandler(Renderer renderer, List<XMLHandler> lst) {
         XMLHandler handler;
         if (lst != null) {
             for (int i = 0, c = lst.size(); i < c; i++) {
                 //TODO Maybe add priorities later
-                handler = (XMLHandler)lst.get(i);
+                handler = lst.get(i);
                 if (handler.supportsRenderer(renderer)) {
                     return handler;
                 }
@@ -147,7 +147,7 @@ public class XMLHandlerRegistry {
      */
     private void discoverXMLHandlers() {
         // add mappings from available services
-        Iterator providers = Service.providers(XMLHandler.class);
+        Iterator<Object> providers = Service.providers(XMLHandler.class);
         if (providers != null) {
             while (providers.hasNext()) {
                 XMLHandler handler = (XMLHandler)providers.next();

src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java

@@ -73,7 +73,7 @@ public class AFPElementMapping extends ElementMapping {
     protected void initialize() {
 
         if (foObjs == null) {
-            super.foObjs = new java.util.HashMap();
+            super.foObjs = new java.util.HashMap<String, Maker>();
             foObjs.put(
                 TAG_LOGICAL_ELEMENT,
                 new AFPTagLogicalElementMaker());

src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java

@@ -57,7 +57,7 @@ public class PCLElementMapping extends ElementMapping {
     protected void initialize() {
 
         if (foObjs == null) {
-            foObjs = new HashMap();
+            foObjs = new HashMap<String, Maker>();
             //No extension elements, yet, only attributes
         }
 

src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java

@@ -38,7 +38,7 @@ public class PDFElementMapping extends ElementMapping {
     /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new java.util.HashMap();
+            foObjs = new java.util.HashMap<String, Maker>();
             foObjs.put(PDFEmbeddedFileElement.ELEMENT, new PDFEmbeddedFileMaker());
         }
     }

src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java

@@ -38,7 +38,7 @@ public class PSExtensionElementMapping extends ElementMapping {
     /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new java.util.HashMap();
+            foObjs = new java.util.HashMap<String, Maker>();
             foObjs.put(PSSetupCodeElement.ELEMENT, new PSSetupCodeMaker());
             foObjs.put(PSPageSetupCodeElement.ELEMENT, new PSPageSetupCodeMaker());
             foObjs.put(PSSetPageDeviceElement.ELEMENT, new PSSetPageDeviceMaker());

test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java

@@ -40,7 +40,7 @@ public class TestElementMapping extends ElementMapping {
     /** @see org.apache.fop.fo.ElementMapping#initialize() */
     protected void initialize() {
         if (foObjs == null) {
-            foObjs = new java.util.HashMap();
+            foObjs = new java.util.HashMap<String, Maker>();
             foObjs.put("assert", new AssertMaker());
         }
     }