pbwest 2004/07/23 21:12:46
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionViewport.java
Log:
No longer implements Cloneable.
clone() removed.
Commented-out methods removed.
Revision Changes Path
No revision
No revision
1.3.2.8 +2 -102 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.3.2.7
retrieving revision 1.3.2.8
diff -u -r1.3.2.7 -r1.3.2.8
--- RegionViewport.java 1 Jun 2004 06:27:05 -0000 1.3.2.7
+++ RegionViewport.java 24 Jul 2004 04:12:46 -0000 1.3.2.8
@@ -26,8 +26,8 @@
* This area is the viewport for a region and contains a region area.
*/
public class RegionViewport
-extends AbstractViewport
-implements Viewport, Cloneable {
+extends BlockViewportArea
+implements Viewport {
/**
* Creates a new region viewport with a null rectangular area
@@ -60,106 +60,6 @@
*/
public RegionRefArea getRegionRefArea() {
return (RegionRefArea)(getReferenceArea());
- }
-
- /**
- * 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;
-// }
-
- /**
- * Clone this region viewport.
- * Used when creating a copy from the page master.
- *
- * @return a new copy of this region viewport
- */
- public Object clone() {
- synchronized (sync) {
- RegionViewport rv;
- try {
- rv = (RegionViewport)(super.clone());
- } catch (CloneNotSupportedException e) {
- throw new RuntimeException(e);
- }
- rv.refArea = (PageRefArea)(refArea.clone());
- return rv;
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
