[FOray-commit] SF.net SVN: foray: [7840] trunk/foray/foray-render/src/java/org/foray/render
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7840] trunk/foray/foray-render/src/java/org/foray/render
|
From: <vic...@us...> - 2006-08-27 23:55:19
|
Revision: 7840 Author: victormote Date: 2006-08-27 16:55:08 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7840&view=rev Log Message: ----------- Conform to axsl changes: Using relative instead of absolute traits. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -68,38 +68,6 @@ return this.traitGeneratedBy().traitBackgroundImage(this); } - public int getPaddingTop() { - return this.traitGeneratedBy().traitPaddingTop(this); - } - - public int getPaddingLeft() { - return this.traitGeneratedBy().traitPaddingLeft(this); - } - - public int getPaddingBottom() { - return this.traitGeneratedBy().traitPaddingBottom(this); - } - - public int getPaddingRight() { - return this.traitGeneratedBy().traitPaddingRight(this); - } - - public int getBorderTopWidth() { - return this.traitGeneratedBy().traitBorderTopWidth(this); - } - - public int getBorderRightWidth() { - return this.traitGeneratedBy().traitBorderRightWidth(this); - } - - public int getBorderLeftWidth() { - return this.traitGeneratedBy().traitBorderLeftWidth(this); - } - - public int getBorderBottomWidth() { - return this.traitGeneratedBy().traitBorderBottomWidth(this); - } - public BlockContainerRA getNearestAncestorAreaContainer() { AreaNode areaNode = this.getAreaNodeParent(); while (areaNode != null && !(areaNode instanceof BlockContainerRA)) { @@ -187,20 +155,20 @@ return getPrimaryFont().getFont().getDescender(traitFontSize()); } - public Color traitBorderTopColor() { - return traitGeneratedBy().traitBorderTopColor(this); + public Color traitBorderBeforeColor() { + return traitGeneratedBy().traitBorderBeforeColor(this); } - public Color traitBorderLeftColor() { - return traitGeneratedBy().traitBorderLeftColor(this); + public Color traitBorderStartColor() { + return traitGeneratedBy().traitBorderStartColor(this); } - public Color traitBorderRightColor() { - return traitGeneratedBy().traitBorderRightColor(this); + public Color traitBorderEndColor() { + return traitGeneratedBy().traitBorderEndColor(this); } - public Color traitBorderBottomColor() { - return traitGeneratedBy().traitBorderBottomColor(this); + public Color traitBorderAfterColor() { + return traitGeneratedBy().traitBorderAfterColor(this); } public String traitFontFamily() { Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -62,23 +62,23 @@ final int bottom = area.traitBorderAfterWidth(); // If style is solid, use filled rectangles if (top != 0) { - drawRectangle(rx, ry, w, top, true, area.traitBorderTopColor(), - true, area.traitBorderTopColor()); + drawRectangle(rx, ry, w, top, true, area.traitBorderBeforeColor(), + true, area.traitBorderBeforeColor()); } if (left != 0) { drawRectangle(rx - left, ry - h - bottom, left, h + top + bottom, - true, area.traitBorderLeftColor(), - true, area.traitBorderLeftColor()); + true, area.traitBorderStartColor(), + true, area.traitBorderStartColor()); } if (right != 0) { drawRectangle(rx + w, ry - h - bottom, right, h + top + bottom, - true, area.traitBorderRightColor(), - true, area.traitBorderRightColor()); + true, area.traitBorderEndColor(), + true, area.traitBorderEndColor()); } if (bottom != 0) { drawRectangle(rx, ry - h - bottom, w, bottom, - true, area.traitBorderBottomColor(), - true, area.traitBorderBottomColor()); + true, area.traitBorderAfterColor(), + true, area.traitBorderAfterColor()); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -450,22 +450,22 @@ if (area.traitBorderBeforeWidth() != 0) { drawLine(rx, ry, rx + w, ry, -area.traitBorderBeforeWidth(), - Constants.FOVAL_SOLID, area.traitBorderTopColor()); + Constants.FOVAL_SOLID, area.traitBorderBeforeColor()); } if (area.traitBorderStartWidth() != 0) { drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), - Constants.FOVAL_SOLID, area.traitBorderLeftColor()); + Constants.FOVAL_SOLID, area.traitBorderStartColor()); } if (area.traitBorderEndWidth() != 0) { drawLine(rx + w, ry, rx + w, ry - h, -area.traitBorderEndWidth(), - Constants.FOVAL_SOLID, area.traitBorderRightColor()); + Constants.FOVAL_SOLID, area.traitBorderEndColor()); } if (area.traitBorderAfterWidth() != 0) { drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), - Constants.FOVAL_SOLID, area.traitBorderBottomColor()); + Constants.FOVAL_SOLID, area.traitBorderAfterColor()); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -991,7 +991,7 @@ write(w + " 0 rlineto"); write(area.traitBorderBeforeWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderTopColor()); + useColor(area.traitBorderBeforeColor()); write("stroke"); } if (area.traitBorderStartWidth() != 0) { @@ -1000,7 +1000,7 @@ write("0 " + (-h) + " rlineto"); write(area.traitBorderStartWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderLeftColor()); + useColor(area.traitBorderStartColor()); write("stroke"); } if (area.traitBorderEndWidth() != 0) { @@ -1009,7 +1009,7 @@ write("0 " + (-h) + " rlineto"); write(area.traitBorderEndWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderRightColor()); + useColor(area.traitBorderEndColor()); write("stroke"); } if (area.traitBorderAfterWidth() != 0) { @@ -1018,7 +1018,7 @@ write(w + " 0 rlineto"); write(area.traitBorderAfterWidth() + " setlinewidth"); write("0 setlinecap"); - useColor(area.traitBorderBottomColor()); + useColor(area.traitBorderAfterColor()); write("stroke"); } } Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 23:42:57 UTC (rev 7839) +++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java 2006-08-27 23:55:08 UTC (rev 7840) @@ -311,22 +311,22 @@ if (area.traitBorderBeforeWidth() != 0) { drawLine(rx, ry, rx + w, ry, area.traitBorderBeforeWidth(), - Constants.FOVAL_SOLID, area.traitBorderTopColor()); + Constants.FOVAL_SOLID, area.traitBorderBeforeColor()); } if (area.traitBorderStartWidth() != 0) { drawLine(rx, ry, rx, ry - h, area.traitBorderStartWidth(), - Constants.FOVAL_DASHED, area.traitBorderLeftColor()); + Constants.FOVAL_DASHED, area.traitBorderStartColor()); } if (area.traitBorderEndWidth() != 0) { drawLine(rx + w, ry, rx + w, ry - h, area.traitBorderEndWidth(), - Constants.FOVAL_DASHED, area.traitBorderRightColor()); + Constants.FOVAL_DASHED, area.traitBorderEndColor()); } if (area.traitBorderAfterWidth() != 0) { drawLine(rx, ry - h, rx + w, ry - h, area.traitBorderAfterWidth(), - Constants.FOVAL_DASHED, area.traitBorderBottomColor()); + Constants.FOVAL_DASHED, area.traitBorderAfterColor()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |