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 ad...@apache.org on 2005/09/15 12:49:21 UTC
svn commit: r289198 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties:
ColumnNumberPropertyMaker.java CommonBorderPaddingBackground.java
NumberProperty.java TableBorderPrecedence.java
Author: adelmelle
Date: Thu Sep 15 03:49:13 2005
New Revision: 289198
URL: http://svn.apache.org/viewcvs?rev=289198&view=rev
Log:
Removal of ColumnNumberPropertyMaker.java (until all further conflicts have been resolved)
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java?rev=289198&r1=289197&r2=289198&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java Thu Sep 15 03:49:13 2005
@@ -75,7 +75,7 @@
public static final int START = 2;
/** the "end" edge */
public static final int END = 3;
-
+
public static class BorderInfo implements Cloneable {
private int mStyle; // Enum for border style
private ColorType mColor; // Border color
@@ -139,6 +139,7 @@
* @throws PropertyException if there's an error while binding the properties
*/
public CommonBorderPaddingBackground(PropertyList pList, FObj fobj) throws PropertyException {
+
backgroundAttachment = pList.get(Constants.PR_BACKGROUND_ATTACHMENT).getEnum();
backgroundColor = pList.get(Constants.PR_BACKGROUND_COLOR).getColorType();
if (backgroundColor.getAlpha() == 0) {
@@ -201,9 +202,9 @@
// If style = none, force width to 0, don't get Color (spec 7.7.20)
int style = pList.get(styleProp).getEnum();
if (style != Constants.EN_NONE) {
- setBorderInfo(new BorderInfo(style,
- pList.get(widthProp).getCondLength(),
- pList.get(colorProp).getColorType()), side);
+ setBorderInfo(new BorderInfo(style,
+ pList.get(widthProp).getCondLength(),
+ pList.get(colorProp).getColorType()), side);
}
}
@@ -364,4 +365,5 @@
return ((getPaddingBefore(false, context) + getPaddingAfter(false, context)
+ getPaddingStart(false, context) + getPaddingEnd(false, context)) > 0);
}
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java?rev=289198&r1=289197&r2=289198&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java Thu Sep 15 03:49:13 2005
@@ -86,7 +86,7 @@
public NumberProperty(int num) {
this.number = new Integer(num);
}
-
+
/**
* Plain number always has a dimension of 0.
* @return a dimension of 0.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java?rev=289198&r1=289197&r2=289198&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java Thu Sep 15 03:49:13 2005
@@ -37,8 +37,8 @@
}
/**
- * Recalculate the line-height value based on the nearest specified
- * value.
+ * Set default precedence according to the parent FObj
+ *
* @see PropertyMaker#compute(PropertyList)
*/
public Property make(PropertyList propertyList) throws PropertyException {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org