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 bc...@apache.org on 2004/09/22 10:19:48 UTC
cvs commit: xml-fop/src/java/org/apache/fop/area RegionViewport.java
bckfnn 2004/09/22 01:19:48
Modified: src/java/org/apache/fop/area RegionViewport.java
Log:
get[Border|Padding]Width* helper methods moved to Area.
Revision Changes Path
1.5 +0 -83 xml-fop/src/java/org/apache/fop/area/RegionViewport.java
Index: RegionViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionViewport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RegionViewport.java 27 Feb 2004 17:41:26 -0000 1.4
+++ RegionViewport.java 22 Sep 2004 08:19:48 -0000 1.5
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.fop.traits.BorderProps;
-
/**
* Region Viewport reference area.
* This area is the viewport for a region and contains a region area.
@@ -77,87 +75,6 @@
*/
public Rectangle2D getViewArea() {
return viewArea;
- }
-
- /**
- * Return the sum of region border- and padding-before
- *
- * @return width in millipoints
- */
- public int getBorderAndPaddingWidthBefore() {
- int margin = 0;
- BorderProps bps = (BorderProps) getTrait(Trait.BORDER_BEFORE);
- if (bps != null) {
- margin = bps.width;
- }
-
- Integer padWidth = (Integer) getTrait(Trait.PADDING_BEFORE);
- if (padWidth != null) {
- margin += padWidth.intValue();
- }
-
- return margin;
- }
-
- /**
- * Return the sum of region border- and padding-after
- *
- * @return width in millipoints
- */
- public int getBorderAndPaddingWidthAfter() {
- int margin = 0;
-
- BorderProps bps = (BorderProps) getTrait(Trait.BORDER_AFTER);
- if (bps != null) {
- margin = bps.width;
- }
-
- Integer padWidth = (Integer) getTrait(Trait.PADDING_AFTER);
- if (padWidth != null) {
- margin += padWidth.intValue();
- }
-
- return margin;
- }
-
- /**
- * Return the sum of region border- and padding-start
- *
- * @return width in millipoints
- */
- public int getBorderAndPaddingWidthStart() {
- int margin = 0;
- BorderProps bps = (BorderProps) getTrait(Trait.BORDER_START);
- if (bps != null) {
- margin = bps.width;
- }
-
- Integer padWidth = (Integer) getTrait(Trait.PADDING_START);
- if (padWidth != null) {
- margin += padWidth.intValue();
- }
-
- return margin;
- }
-
- /**
- * Return the sum of region border- and padding-end
- *
- * @return width in millipoints
- */
- public int getBorderAndPaddingWidthEnd() {
- int margin = 0;
- BorderProps bps = (BorderProps) getTrait(Trait.BORDER_END);
- if (bps != null) {
- margin = bps.width;
- }
-
- Integer padWidth = (Integer) getTrait(Trait.PADDING_END);
- if (padWidth != null) {
- margin += padWidth.intValue();
- }
-
- return margin;
}
private void writeObject(java.io.ObjectOutputStream out)
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org