Author: spepping
Date: Tue Jan 4 13:36:10 2011
New Revision: 1055034
URL: http://svn.apache.org/viewvc?rev=1055034&view=rev
Log:
Add type-safe parameters to collections; replace XGC jar to benefit from new
type-safe methods
Modified:
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/InternalElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
Modified:
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -45,7 +45,7 @@ public class PlanElementMapping extends
/** {...@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());
}
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.5svn.jar?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java Tue
Jan 4 13:36:10 2011
@@ -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();
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
Tue Jan 4 13:36:10 2011
@@ -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);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java Tue
Jan 4 13:36:10 2011
@@ -44,7 +44,7 @@ public class FOElementMapping extends El
*/
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());
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -37,8 +37,8 @@ public class ExtensionElementMapping ext
/** 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 ext
*/
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());
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/InternalElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/InternalElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/InternalElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/InternalElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -34,7 +34,7 @@ public class InternalElementMapping exte
/** 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 exte
*/
protected void initialize() {
if (foObjs == null) {
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -44,7 +44,7 @@ public class OldExtensionElementMapping
*/
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));
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -73,7 +73,7 @@ public class BatikExtensionElementMappin
XMLResourceDescriptor.setXMLParserClassName(
getAParserClassName());
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
foObjs.put("batik", new SE());
foObjs.put(DEFAULT, new SVGMaker());
} catch (Throwable t) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -80,7 +80,7 @@ public class SVGElementMapping extends E
XMLResourceDescriptor.setXMLParserClassName(
getAParserClassName());
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
foObjs.put("svg", new SE());
foObjs.put(DEFAULT, new SVGMaker());
} catch (Throwable t) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -45,7 +45,7 @@ public class RDFElementMapping extends E
/** {...@inheritdoc} */
protected void initialize() {
if (foObjs == null) {
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
foObjs.put("RDF", new RDFElementMaker());
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -45,7 +45,7 @@ public class XMPElementMapping extends E
/** {...@inheritdoc} */
protected void initialize() {
if (foObjs == null) {
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
foObjs.put("xmpmeta", new XMPMetaElementMaker());
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerRegistry.java
Tue Jan 4 13:36:10 2011
@@ -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();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -73,7 +73,7 @@ public class AFPElementMapping extends E
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());
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -57,7 +57,7 @@ public class PCLElementMapping extends E
protected void initialize() {
if (foObjs == null) {
- foObjs = new HashMap();
+ foObjs = new HashMap<String, Maker>();
//No extension elements, yet, only attributes
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -38,7 +38,7 @@ public class PDFElementMapping extends E
/** {...@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());
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -38,7 +38,7 @@ public class PSExtensionElementMapping e
/** {...@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());
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=1055034&r1=1055033&r2=1055034&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
Tue Jan 4 13:36:10 2011
@@ -40,7 +40,7 @@ public class TestElementMapping extends
/** @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());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
