You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2006/03/27 20:01:22 UTC
svn commit: r389212 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
apps/FopFactory.java fo/ElementMappingRegistry.java
Author: jeremias
Date: Mon Mar 27 10:01:20 2006
New Revision: 389212
URL: http://svn.apache.org/viewcvs?rev=389212&view=rev
Log:
Fixed addition of ElementMapping instances. Witnessed in the FO tree tests.
The ElementMapping list is not necessary since we now have the ElementMappingRegistry.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=389212&r1=389211&r2=389212&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Mon Mar 27 10:01:20 2006
@@ -108,9 +108,6 @@
/** @see #setBreakIndentInheritanceOnReferenceAreaBoundary(boolean) */
private boolean breakIndentInheritanceOnReferenceAreaBoundary = false;
- /** Additional fo.ElementMapping subclasses set by user */
- private List additionalElementMappings = null;
-
/** Optional overriding LayoutManagerMaker */
private LayoutManagerMaker lmMakerOverride = null;
@@ -260,18 +257,7 @@
* @param elementMapping the class name representing the element mapping.
*/
public void addElementMapping(ElementMapping elementMapping) {
- if (additionalElementMappings == null) {
- additionalElementMappings = new java.util.ArrayList();
- }
- additionalElementMappings.add(elementMapping);
- }
-
- /**
- * Returns the List of user-added ElementMapping class names
- * @return List of Strings holding ElementMapping names.
- */
- public List getAdditionalElementMappings() {
- return additionalElementMappings;
+ this.elementMappingRegistry.addElementMapping(elementMapping);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java?rev=389212&r1=389211&r2=389212&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 Mon Mar 27 10:01:20 2006
@@ -59,15 +59,6 @@
public ElementMappingRegistry(FopFactory factory) {
// Add standard element mappings
setupDefaultMappings();
-
- // add additional ElementMappings defined within FOUserAgent
- List addlEMs = factory.getAdditionalElementMappings();
-
- if (addlEMs != null) {
- for (int i = 0; i < addlEMs.size(); i++) {
- addElementMapping((ElementMapping) addlEMs.get(i));
- }
- }
}
/**
@@ -116,7 +107,11 @@
}
}
- private void addElementMapping(ElementMapping mapping) {
+ /**
+ * Add the element mapping.
+ * @param mapping the element mapping instance
+ */
+ public void addElementMapping(ElementMapping mapping) {
this.fobjTable.put(mapping.getNamespaceURI(), mapping.getTable());
this.namespaces.put(mapping.getNamespaceURI().intern(), mapping);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org