jeremias 2005/02/07 02:55:35
Modified: src/java/org/apache/fop/fo/flow TableRow.java TableCell.java
Log:
Additional accessors and style.
Revision Changes Path
1.44 +14 -15 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- TableRow.java 24 Dec 2004 12:06:26 -0000 1.43
+++ TableRow.java 7 Feb 2005 10:55:35 -0000 1.44
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -35,7 +32,6 @@
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
-import org.apache.fop.layoutmgr.table.Row;
/**
* Class modelling the fo:table-row object.
@@ -123,14 +119,14 @@
}
/**
- * Return the "id" property.
+ * @return the "id" property.
*/
public String getId() {
return id;
}
/**
- * Return the "keep-with-previous" property.
+ * @return the "keep-with-previous" property.
*/
public KeepProperty getKeepWithPrevious() {
return keepWithPrevious;
@@ -151,29 +147,32 @@
}
/**
- * Return the "height" property.
+ * @return the "block-progression-dimension" property.
+ */
+ public LengthRangeProperty getBlockProgressionDimension() {
+ return blockProgressionDimension;
+ }
+
+ /**
+ * @return the "height" property.
*/
public Length getHeight() {
return height;
}
/**
- * Return the Common Border, Padding, and Background Properties.
+ * @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
- /**
- * @see org.apache.fop.fo.FObj#getName()
- */
+ /** @see org.apache.fop.fo.FObj#getName() */
public String getName() {
return "fo:table-row";
}
- /**
- * @see org.apache.fop.fo.FObj#getNameId()
- */
+ /** @see org.apache.fop.fo.FObj#getNameId() */
public int getNameId() {
return FO_TABLE_ROW;
}
1.43 +18 -10 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TableCell.java 24 Dec 2004 12:06:26 -0000 1.42
+++ TableCell.java 7 Feb 2005 10:55:35 -0000 1.43
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -36,7 +33,6 @@
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
-import org.apache.fop.layoutmgr.table.Cell;
/**
* Class modelling the fo:table-cell object.
@@ -282,41 +278,53 @@
}
/**
- * Return the Common Border, Padding, and Background Properties.
+ * @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
/**
- * Return the "column-number" property.
+ * @return the "column-number" property.
*/
public int getColumnNumber() {
return Math.max(columnNumber.getValue(), 0);
}
/**
- * Return the "id" property.
+ * @return the "id" property.
*/
public String getId() {
return id;
}
/**
- * Return the "number-columns-spanned" property.
+ * @return the "number-columns-spanned" property.
*/
public int getNumberColumnsSpanned() {
return Math.max(numberColumnsSpanned.getValue(), 1);
}
/**
- * Return the "number-rows-spanned" property.
+ * @return the "number-rows-spanned" property.
*/
public int getNumberRowsSpanned() {
return Math.max(numberRowsSpanned.getValue(), 1);
}
/**
+ * @return the "block-progression-dimension" property.
+ */
+ public LengthRangeProperty getBlockProgressionDimension() {
+ return blockProgressionDimension;
+ }
+
+ /** @return the display-align property. */
+ public int getDisplayAlign() {
+ return displayAlign;
+ }
+
+ /**
* @see org.apache.fop.fo.FObj#getName()
*/
public String getName() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
