gmazza 2004/06/20 00:46:13
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo/pagination LayoutMasterSet.java
RepeatablePageMasterAlternatives.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/tools AreaTreeBuilder.java
Log:
1. Created own logger for AbstractRenderer, removed logger setter from Renderer
interface.
2. Validity checking for fo:repeatable-page-master-alternatives.
Revision Changes Path
1.72 +1 -2 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Driver.java 20 Jun 2004 05:15:40 -0000 1.71
+++ Driver.java 20 Jun 2004 07:46:13 -0000 1.72
@@ -409,7 +409,6 @@
throws IllegalArgumentException {
try {
renderer = (Renderer)Class.forName(rendererClassName).newInstance();
- renderer.setLogger(getLogger());
renderer.setProducer(Version.getVersion());
renderer.setUserAgent(getUserAgent());
} catch (ClassNotFoundException e) {
1.12 +3 -0
xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LayoutMasterSet.java 17 Jun 2004 07:02:13 -0000 1.11
+++ LayoutMasterSet.java 20 Jun 2004 07:46:13 -0000 1.12
@@ -69,6 +69,9 @@
}
}
+ /**
+ * @see org.apache.fop.fo.FONode#end
+ */
protected void end() {
if (children == null) {
missingChildElementError("(simple-page-master|page-sequence-master)+");
1.8 +22 -0
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RepeatablePageMasterAlternatives.java 12 Jun 2004 23:18:52 -0000 1.7
+++ RepeatablePageMasterAlternatives.java 20 Jun 2004 07:46:13 -0000 1.8
@@ -23,8 +23,10 @@
// XML
import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
// FOP
+import org.apache.fop.fo.FOElementMapping;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
@@ -55,6 +57,26 @@
*/
public RepeatablePageMasterAlternatives(FONode parent) {
super(parent);
+ }
+
+ /**
+ * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ XSL/FOP: (conditional-page-master-reference+)
+ */
+ protected void validateChildNode(Locator loc, String nsURI, String localName) {
+ if (!(nsURI == FOElementMapping.URI &&
+ localName.equals("conditional-page-master-reference"))) {
+ invalidChildError(loc, nsURI, localName);
+ }
+ }
+
+ /**
+ * @see org.apache.fop.fo.FONode#end
+ */
+ protected void end() {
+ if (children == null) {
+ missingChildElementError("(conditional-page-master-reference+)");
+ }
}
/**
1.27 +3 -10 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractRenderer.java 22 Apr 2004 21:38:39 -0000 1.26
+++ AbstractRenderer.java 20 Jun 2004 07:46:13 -0000 1.27
@@ -64,6 +64,7 @@
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fo.pagination.Region;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
// Avalon
import org.apache.avalon.framework.configuration.Configurable;
@@ -86,8 +87,8 @@
/**
* logging instance
*/
- protected Log logger = null;
-
+ protected static Log logger = LogFactory.getLog("Renderer");
+
/**
* producer (usually "FOP")
*/
@@ -139,14 +140,6 @@
* @see
org.apache.avalon.framework.configuration.Configurable#configure(Configuration)
*/
public void configure(Configuration conf) throws ConfigurationException {
- }
-
- /**
- * Sets the Commons-Logging instance for this class
- * @param logger The Commons-Logging instance
- */
- public void setLogger(Log logger) {
- this.logger = logger;
}
/**
1.11 +0 -7 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Renderer.java 22 Apr 2004 21:38:39 -0000 1.10
+++ Renderer.java 20 Jun 2004 07:46:13 -0000 1.11
@@ -187,13 +187,6 @@
* @param cont The inline container area
*/
void renderContainer(Container cont);
-
- /**
- * Tells the renderer to render an inline container.
- *
- * @param cont The inline container area
- */
- void setLogger(Log logger);
}
1.19 +0 -1 xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
Index: AreaTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AreaTreeBuilder.java 18 Jun 2004 04:13:54 -0000 1.18
+++ AreaTreeBuilder.java 20 Jun 2004 07:46:13 -0000 1.19
@@ -159,7 +159,6 @@
rend = new SVGRenderer();
}
- rend.setLogger(logger);
FontInfo fontInfo = new FontInfo();
rend.setupFontInfo(fontInfo);
FOUserAgent ua = new FOUserAgent();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
