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 2008/06/19 10:25:47 UTC
svn commit: r669423 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo:
FOEventHandler.java FOTreeBuilder.java properties/PageDimensionMaker.java
Author: jeremias
Date: Thu Jun 19 01:25:46 2008
New Revision: 669423
URL: http://svn.apache.org/viewvc?rev=669423&view=rev
Log:
Simplifications and a Checkstyle fix.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java?rev=669423&r1=669422&r2=669423&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java Thu Jun 19 01:25:46 2008
@@ -566,7 +566,7 @@
* @param start Offset for characters to process.
* @param length Portion of array to process.
*/
- public void characters(char data[], int start, int length) {
+ public void characters(char[] data, int start, int length) {
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=669423&r1=669422&r2=669423&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java Thu Jun 19 01:25:46 2008
@@ -150,8 +150,7 @@
this.delegate.endDocument();
if (this.rootFObj == null && empty) {
FOValidationEventProducer eventProducer
- = FOValidationEventProducer.Provider.get(
- foEventHandler.getUserAgent().getEventBroadcaster());
+ = FOValidationEventProducer.Provider.get(userAgent.getEventBroadcaster());
eventProducer.emptyDocument(this);
}
rootFObj = null;
@@ -254,7 +253,7 @@
|| !localName.equals("root")) {
FOValidationEventProducer eventProducer
= FOValidationEventProducer.Provider.get(
- foEventHandler.getUserAgent().getEventBroadcaster());
+ userAgent.getEventBroadcaster());
eventProducer.invalidFORoot(this, FONode.getNodeString(namespaceURI, localName),
getEffectiveLocator());
}
@@ -379,7 +378,7 @@
if (maker instanceof UnknownXMLObj.Maker) {
FOValidationEventProducer eventProducer
= FOValidationEventProducer.Provider.get(
- foEventHandler.getUserAgent().getEventBroadcaster());
+ userAgent.getEventBroadcaster());
eventProducer.unknownFormattingObject(this, currentFObj.getName(),
new QName(namespaceURI, localName),
getEffectiveLocator());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java?rev=669423&r1=669422&r2=669423&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java Thu Jun 19 01:25:46 2008
@@ -23,7 +23,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.LengthProperty;
/**
* Custom Maker for page-height / page-width
@@ -54,8 +53,8 @@
Property p = super.get(0, propertyList, tryInherit, tryDefault);
FObj fo = propertyList.getFObj();
String fallbackValue = (propId == Constants.PR_PAGE_HEIGHT)
- ? fo.getFOEventHandler().getUserAgent().getPageHeight()
- : fo.getFOEventHandler().getUserAgent().getPageWidth();
+ ? fo.getUserAgent().getPageHeight()
+ : fo.getUserAgent().getPageWidth();
if (p.getEnum() == Constants.EN_INDEFINITE) {
int otherId = (propId == Constants.PR_PAGE_HEIGHT)
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org