Author: spepping
Date: Thu Jan 27 15:34:12 2011
New Revision: 1064159
URL: http://svn.apache.org/viewvc?rev=1064159&view=rev
Log:
Fix an forgotten change of type in class Area and a checkstyle error in class
FObj
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=1064159&r1=1064158&r2=1064159&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Thu Jan 27
15:34:12 2011
@@ -378,11 +378,11 @@ public class Area extends AreaTreeObject
* @param traitCode the trait key
* @param prop the value of the trait
*/
- public void addTrait(Object traitCode, Object prop) {
+ public void addTrait(Integer traitCode, Object prop) {
if (props == null) {
props = new java.util.HashMap<Integer, Object>(20);
}
- props.put((Integer)traitCode, prop);
+ props.put(traitCode, prop);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1064159&r1=1064158&r2=1064159&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Thu Jan 27
15:34:12 2011
@@ -47,10 +47,10 @@ public abstract class FObj extends FONod
private static final PropertyMaker[] PROPERTY_LIST_TABLE
= FOPropertyMapping.getGenericMappings();
- /**
- * pointer to the descendant subtree
- */
+ /** pointer to the descendant subtree */
protected FONode firstChild;
+
+ /** pointer to the end of the descendant subtree */
protected FONode lastChild;
/** The list of extension attachments, null if none */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java?rev=1064159&r1=1064158&r2=1064159&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Thu Jan 27 15:34:12 2011
@@ -104,10 +104,10 @@ public final class TraitSetter {
private static void addBorderTrait(Area area,
CommonBorderPaddingBackground bpProps,
boolean bDiscard, int iSide, int mode,
- Object oTrait) {
+ Integer trait) {
int iBP = bpProps.getBorderWidth(iSide, bDiscard);
if (iBP > 0) {
- area.addTrait(oTrait,
+ area.addTrait(trait,
new BorderProps(bpProps.getBorderStyle(iSide),
iBP, bpProps.getBorderColor(iSide),
mode));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
