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 vh...@apache.org on 2010/08/17 20:57:15 UTC
svn commit: r986451 [2/13] - in
/xmlgraphics/fop/branches/Temp_ComplexScripts: ./
examples/plan/src/org/apache/fop/plan/
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/ src/codegen/u...
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/output.xml?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/output.xml Tue Aug 17 18:57:04 2010
@@ -194,32 +194,76 @@ out = proc.getOutputStream();]]></source
e.printStackTrace();
}
}]]></source>
- <p>
- Check the iText tutorial and documentation for setting access flags, password,
- encryption strength and other parameters.
- </p>
- </section>
- <section id="pdf-watermark">
- <title>Watermarks</title>
- <p>
- In addition to the <a href="#pdf-postprocess">PDF Post-processing</a> options, consider the following workarounds:
- </p>
- <ul>
- <li>
- Use a background image for the body region.
- </li>
- <li>
- (submitted by Trevor Campbell) Place an image in a
- region that overlaps the flowing text. For example, make
- region-before large enough to contain your image. Then include a
- block (if necessary, use an absolutely positioned block-container)
- containing the watermark image in the static-content for the
- region-before. Note that the image will be drawn on top of the
- normal content.
- </li>
- </ul>
+ <p>
+ Check the iText tutorial and documentation for setting access flags, password,
+ encryption strength and other parameters.
+ </p>
+ </section>
+ <section id="pdf-watermark">
+ <title>Watermarks</title>
+ <p>
+ In addition to the <a href="#pdf-postprocess">PDF Post-processing</a> options, consider the following workarounds:
+ </p>
+ <ul>
+ <li>
+ Use a background image for the body region.
+ </li>
+ <li>
+ (submitted by Trevor Campbell) Place an image in a
+ region that overlaps the flowing text. For example, make
+ region-before large enough to contain your image. Then include a
+ block (if necessary, use an absolutely positioned block-container)
+ containing the watermark image in the static-content for the
+ region-before. Note that the image will be drawn on top of the
+ normal content.
+ </li>
+ </ul>
+ </section>
+ <section id="pdf-extensions">
+ <title>Extensions</title>
+ <p>The PDF Renderer supports some PDF specific extensions which can be embedded
+ into the input FO document. To use the extensions the appropriate namespace must
+ be declared in the fo:root element like this:</p>
+ <source><![CDATA[
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
+ ]]></source>
+ <section id="pdf-embedded-file">
+ <title>Embedded Files</title>
+ <p>
+ It is possible to attach/embed arbitrary files into a PDF file. You can give a name and
+ a description of the file. Example:
+ </p>
+ <source><![CDATA[
+ <fo:declarations>
+ <pdf:embedded-file filename="image.jpg" src="url(file:///C:/Temp/myimage.jpg)" description="My image"/>
+ <pdf:embedded-file src="url(file:///C:/Temp/MyTextDoc.odt)"/>
+ </fo:declarations>
+ ]]></source>
+ <p>
+ <code>pdf:embedded-file</code> must be a child of <code>fo:declarations</code>.
+ The "src" property is used to reference the file that is to be embedded. This property
+ uses the "uri-specification" datatype from the XSL-FO specification.
+ The "filename" property is optional. If it is missing the filename is automatically set
+ from the URI/IRI of the "src" property. An optional description can also be added to
+ further describe the file attachment.
+ </p>
+ <p>
+ It is also possible to reference an embedded file from an <code>fo:basic-link</code>.
+ Use the special "embedded-file:" URI scheme with the filename as single argument after
+ the URI scheme. Example:
+ </p>
+ <source><![CDATA[
+<fo:basic-link external-destination="url(embedded-file:image.jpg)">Attached Image</fo:basic-link>
+]]></source>
+ <p>
+ Note: Not all PDF Viewers (including some Acrobat Versions) will open the embedded file
+ when clicking on the link. In that case, the user will have to open he attachment via
+ the separate list of file attachments.
+ </p>
+ </section>
+ </section>
</section>
-</section>
<section id="ps">
<title>PostScript</title>
<p>
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/running.xml?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/running.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/running.xml Tue Aug 17 18:57:04 2010
@@ -132,9 +132,12 @@ Fop [options] [-fo|-xml] infile [-xsl fi
-pdfprofile prof PDF file will be generated with the specified profile
(Examples for prof: PDF/A-1b or PDF/X-3:2003)
- -conserve Enable memory-conservation policy (trades memory-consumption for disk I/O)
+ -conserve enable memory-conservation policy (trades memory-consumption for disk I/O)
(Note: currently only influences whether the area tree is serialized.)
+ -cache specifies a file/directory path location
+ -flush flushes the current font cache file
+
[INPUT]
infile xsl:fo input file (the same as the next)
(use '-' for infile to pipe input from stdin)
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/META-INF/services/org.apache.fop.fo.ElementMapping
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/META-INF/services/org.apache.fop.fo.ElementMapping?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/META-INF/services/org.apache.fop.fo.ElementMapping (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/META-INF/services/org.apache.fop.fo.ElementMapping Tue Aug 17 18:57:04 2010
@@ -9,3 +9,4 @@ org.apache.fop.fo.extensions.xmp.RDFElem
org.apache.fop.render.ps.extensions.PSExtensionElementMapping
org.apache.fop.render.afp.extensions.AFPElementMapping
org.apache.fop.render.pcl.extensions.PCLElementMapping
+org.apache.fop.render.pdf.extensions.PDFElementMapping
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/ResourceEventProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/ResourceEventProducer.java Tue Aug 17 18:57:04 2010
@@ -39,7 +39,10 @@ public interface ResourceEventProducer e
/**
* Provider class for the event producer.
*/
- class Provider {
+ final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPBorderPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPBorderPainter.java Tue Aug 17 18:57:04 2010
@@ -40,7 +40,7 @@ public class AFPBorderPainter extends Ab
}
/** {@inheritDoc} */
- public void paint(PaintingInfo paintInfo) {
+ public void paint(PaintingInfo paintInfo) { // CSOK: MethodLength
BorderPaintingInfo borderPaintInfo = (BorderPaintingInfo)paintInfo;
float w = borderPaintInfo.getX2() - borderPaintInfo.getX1();
float h = borderPaintInfo.getY2() - borderPaintInfo.getY1();
@@ -60,6 +60,7 @@ public class AFPBorderPainter extends Ab
float y2 = unitConv.pt2units(borderPaintInfo.getY2());
switch (paintingState.getRotation()) {
+ default:
case 0:
x1 += at.getTranslateX();
y1 += at.getTranslateY();
@@ -89,8 +90,8 @@ public class AFPBorderPainter extends Ab
AFPLineDataInfo lineDataInfo = new AFPLineDataInfo();
lineDataInfo.setColor(borderPaintInfo.getColor());
lineDataInfo.setRotation(paintingState.getRotation());
- lineDataInfo.x1 = Math.round(x1);
- lineDataInfo.y1 = Math.round(y1);
+ lineDataInfo.setX1 ( Math.round(x1) );
+ lineDataInfo.setY1 ( Math.round(y1) );
float thickness;
if (borderPaintInfo.isHorizontal()) {
thickness = y2 - y1;
@@ -105,83 +106,91 @@ public class AFPBorderPainter extends Ab
int thickness3 = (int)Math.floor(thickness / 3f);
lineDataInfo.setThickness(thickness3);
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = Math.round(x2);
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( Math.round(x2) );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
dataStream.createLine(lineDataInfo);
int distance = thickness3 * 2;
lineDataInfo = new AFPLineDataInfo(lineDataInfo);
- lineDataInfo.y1 += distance;
- lineDataInfo.y2 += distance;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + distance );
+ lineDataInfo.setY2 ( lineDataInfo.getY2() + distance );
dataStream.createLine(lineDataInfo);
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = Math.round(y2);
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( Math.round(y2) );
dataStream.createLine(lineDataInfo);
int distance = thickness3 * 2;
lineDataInfo = new AFPLineDataInfo(lineDataInfo);
- lineDataInfo.x1 += distance;
- lineDataInfo.x2 += distance;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + distance );
+ lineDataInfo.setX2 ( lineDataInfo.getX2() + distance );
dataStream.createLine(lineDataInfo);
}
break;
case Constants.EN_DASHED:
- int thick = lineDataInfo.thickness * 3;
+ int thick = lineDataInfo.getThickness() * 3;
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = lineDataInfo.x1 + thick;
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + thick );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
int ex2 = Math.round(x2);
- while (lineDataInfo.x1 + thick < ex2) {
+ while (lineDataInfo.getX1() + thick < ex2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.x1 += 2 * thick;
- lineDataInfo.x2 = lineDataInfo.x1 + thick;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + 2 * thick );
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + thick );
}
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = lineDataInfo.y1 + thick;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + thick );
int ey2 = Math.round(y2);
- while (lineDataInfo.y1 + thick < ey2) {
+ while (lineDataInfo.getY1() + thick < ey2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.y1 += 2 * thick;
- lineDataInfo.y2 = lineDataInfo.y1 + thick;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + 2 * thick );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + thick );
}
}
break;
case Constants.EN_DOTTED:
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = lineDataInfo.x1 + lineDataInfo.thickness;
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + lineDataInfo.getThickness() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
int ex2 = Math.round(x2);
- while (lineDataInfo.x1 + lineDataInfo.thickness < ex2) {
+ while (lineDataInfo.getX1() + lineDataInfo.getThickness() < ex2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.x1 += 3 * lineDataInfo.thickness;
- lineDataInfo.x2 = lineDataInfo.x1 + lineDataInfo.thickness;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + 3 * lineDataInfo.getThickness() );
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + lineDataInfo.getThickness() );
}
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = lineDataInfo.y1 + lineDataInfo.thickness;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + lineDataInfo.getThickness() );
int ey2 = Math.round(y2);
- while (lineDataInfo.y1 + lineDataInfo.thickness < ey2) {
+ while (lineDataInfo.getY1() + lineDataInfo.getThickness() < ey2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.y1 += 3 * lineDataInfo.thickness;
- lineDataInfo.y2 = lineDataInfo.y1 + lineDataInfo.thickness;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + 3 * lineDataInfo.getThickness() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + lineDataInfo.getThickness() );
}
}
break;
case Constants.EN_GROOVE:
case Constants.EN_RIDGE:
//TODO
- lineDataInfo.x2 = Math.round(x2);
+ int yNew;
+ lineDataInfo.setX2 ( Math.round(x2) );
float colFactor = (borderPaintInfo.getStyle() == Constants.EN_GROOVE ? 0.4f : -0.4f);
float h3 = (y2 - y1) / 3;
- lineDataInfo.color = ColorUtil.lightenColor(borderPaintInfo.getColor(), -colFactor);
- lineDataInfo.thickness = Math.round(h3);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1);
+ lineDataInfo.setColor
+ ( ColorUtil.lightenColor(borderPaintInfo.getColor(), -colFactor) );
+ lineDataInfo.setThickness ( Math.round(h3) );
+ yNew = Math.round(y1);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
- lineDataInfo.color = borderPaintInfo.getColor();
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1 + h3);
+ lineDataInfo.setColor ( borderPaintInfo.getColor() );
+ yNew = Math.round(y1 + h3);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
- lineDataInfo.color = ColorUtil.lightenColor(borderPaintInfo.getColor(), colFactor);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1 + h3 + h3);
+ lineDataInfo.setColor ( ColorUtil.lightenColor(borderPaintInfo.getColor(), colFactor) );
+ yNew = Math.round(y1 + h3 + h3);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
break;
case Constants.EN_HIDDEN:
@@ -191,11 +200,11 @@ public class AFPBorderPainter extends Ab
case Constants.EN_SOLID:
default:
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = Math.round(x2);
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( Math.round(x2) );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = Math.round(y2);
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( Math.round(y2) );
}
dataStream.createLine(lineDataInfo);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectInfo.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPDataObjectInfo.java Tue Aug 17 18:57:04 2010
@@ -19,9 +19,6 @@
package org.apache.fop.afp;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.fop.afp.modca.Registry;
import org.apache.fop.afp.modca.triplets.MappingOptionTriplet;
@@ -29,7 +26,6 @@ import org.apache.fop.afp.modca.triplets
* A list of parameters associated with an AFP data objects
*/
public class AFPDataObjectInfo {
- private static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** the object area info */
private AFPObjectAreaInfo objectAreaInfo;
@@ -197,9 +193,9 @@ public class AFPDataObjectInfo {
}
/**
- * Sets the data width resolution
+ * Sets the data height resolution
*
- * @param dataWidthRes the data width resolution
+ * @param dataHeightRes the data height resolution
*/
public void setDataHeightRes(int dataHeightRes) {
this.dataHeightRes = dataHeightRes;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPEventProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPEventProducer.java Tue Aug 17 18:57:04 2010
@@ -28,7 +28,10 @@ import org.apache.fop.events.EventProduc
public interface AFPEventProducer extends EventProducer {
/** Provider class for the event producer. */
- class Provider {
+ static final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPGraphics2D.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPGraphics2D.java Tue Aug 17 18:57:04 2010
@@ -75,7 +75,7 @@ import org.apache.fop.svg.NativeImageHan
*/
public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHandler {
- private static final Log log = LogFactory.getLog(AFPGraphics2D.class);
+ private static final Log LOG = LogFactory.getLog(AFPGraphics2D.class);
private static final int X = 0;
@@ -321,7 +321,7 @@ public class AFPGraphics2D extends Abstr
graphicsObj.setLineType(type);
}
} else {
- log.warn("Unsupported Stroke: " + stroke.getClass().getName());
+ LOG.warn("Unsupported Stroke: " + stroke.getClass().getName());
}
}
@@ -339,7 +339,7 @@ public class AFPGraphics2D extends Abstr
if (paint instanceof Color) {
return true;
}
- log.debug("NYI: applyPaint() " + paint + " fill=" + fill);
+ LOG.debug("NYI: applyPaint() " + paint + " fill=" + fill);
if (paint instanceof TexturePaint) {
// TexturePaint texturePaint = (TexturePaint)paint;
// BufferedImage bufferedImage = texturePaint.getImage();
@@ -490,7 +490,7 @@ public class AFPGraphics2D extends Abstr
currentPosition = new double[]{openingCoords[0], openingCoords[1]};
break;
default:
- log.debug("Unrecognised path iterator type");
+ LOG.debug("Unrecognised path iterator type");
break;
}
}
@@ -498,13 +498,13 @@ public class AFPGraphics2D extends Abstr
/** {@inheritDoc} */
public void draw(Shape shape) {
- log.debug("draw() shape=" + shape);
+ LOG.debug("draw() shape=" + shape);
doDrawing(shape, false);
}
/** {@inheritDoc} */
public void fill(Shape shape) {
- log.debug("fill() shape=" + shape);
+ LOG.debug("fill() shape=" + shape);
doDrawing(shape, true);
}
@@ -516,7 +516,7 @@ public class AFPGraphics2D extends Abstr
*/
public void handleIOException(IOException ioe) {
// TODO Surely, there's a better way to do this.
- log.error(ioe.getMessage());
+ LOG.error(ioe.getMessage());
ioe.printStackTrace();
}
@@ -659,29 +659,29 @@ public class AFPGraphics2D extends Abstr
/** {@inheritDoc} */
public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
- log.debug("drawRenderableImage() NYI: img=" + img + ", xform=" + xform);
+ LOG.debug("drawRenderableImage() NYI: img=" + img + ", xform=" + xform);
}
/** {@inheritDoc} */
public FontMetrics getFontMetrics(Font f) {
- log.debug("getFontMetrics() NYI: f=" + f);
+ LOG.debug("getFontMetrics() NYI: f=" + f);
return null;
}
/** {@inheritDoc} */
public void setXORMode(Color col) {
- log.debug("setXORMode() NYI: col=" + col);
+ LOG.debug("setXORMode() NYI: col=" + col);
}
/** {@inheritDoc} */
public void addNativeImage(org.apache.xmlgraphics.image.loader.Image image,
float x, float y, float width, float height) {
- log.debug("NYI: addNativeImage() " + "image=" + image
+ LOG.debug("NYI: addNativeImage() " + "image=" + image
+ ",x=" + x + ",y=" + y + ",width=" + width + ",height=" + height);
}
/** {@inheritDoc} */
public void copyArea(int x, int y, int width, int height, int dx, int dy) {
- log.debug("copyArea() NYI: ");
+ LOG.debug("copyArea() NYI: ");
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPLineDataInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPLineDataInfo.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPLineDataInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPLineDataInfo.java Tue Aug 17 18:57:04 2010
@@ -25,25 +25,25 @@ import java.awt.Color;
public class AFPLineDataInfo {
/** the x1 coordinate */
- int x1;
+ private int x1;
/** the y1 coordinate */
- int y1;
+ private int y1;
/** the x2 coordinate */
- int x2;
+ private int x2;
/** the y2 coordinate */
- int y2;
+ private int y2;
/** the thickness */
- int thickness;
+ private int thickness;
/** the painting color */
- Color color;
+ private Color color;
/** the rotation */
- int rotation = 0;
+ private int rotation = 0;
/**
* Default constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPRectanglePainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPRectanglePainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPRectanglePainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPRectanglePainter.java Tue Aug 17 18:57:04 2010
@@ -42,6 +42,7 @@ public class AFPRectanglePainter extends
RectanglePaintingInfo rectanglePaintInfo = (RectanglePaintingInfo)paintInfo;
int pageWidth = dataStream.getCurrentPage().getWidth();
int pageHeight = dataStream.getCurrentPage().getHeight();
+ int yNew;
AFPUnitConverter unitConv = paintingState.getUnitConverter();
float width = unitConv.pt2units(rectanglePaintInfo.getWidth());
@@ -52,31 +53,39 @@ public class AFPRectanglePainter extends
AffineTransform at = paintingState.getData().getTransform();
AFPLineDataInfo lineDataInfo = new AFPLineDataInfo();
- lineDataInfo.color = paintingState.getColor();
- lineDataInfo.rotation = paintingState.getRotation();
- lineDataInfo.thickness = Math.round(height);
+ lineDataInfo.setColor ( paintingState.getColor() );
+ lineDataInfo.setRotation ( paintingState.getRotation() );
+ lineDataInfo.setThickness ( Math.round(height) );
- switch (lineDataInfo.rotation) {
+ switch (lineDataInfo.getRotation()) {
+ default:
case 0:
- lineDataInfo.x1 = Math.round((float)at.getTranslateX() + x);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round((float)at.getTranslateY() + y);
- lineDataInfo.x2 = Math.round((float)at.getTranslateX() + x + width);
+ lineDataInfo.setX1 ( Math.round((float)at.getTranslateX() + x) );
+ yNew = Math.round((float)at.getTranslateY() + y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( Math.round((float)at.getTranslateX() + x + width) );
break;
case 90:
- lineDataInfo.x1 = Math.round((float)at.getTranslateY() + x);
- lineDataInfo.y1 = lineDataInfo.y2
- = pageWidth - Math.round((float)at.getTranslateX()) + Math.round(y);
- lineDataInfo.x2 = Math.round(width + (float)at.getTranslateY() + x);
+ lineDataInfo.setX1 ( Math.round((float)at.getTranslateY() + x) );
+ yNew = pageWidth - Math.round((float)at.getTranslateX()) + Math.round(y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( Math.round(width + (float)at.getTranslateY() + x) );
break;
case 180:
- lineDataInfo.x1 = pageWidth - Math.round((float)at.getTranslateX() - x);
- lineDataInfo.y1 = lineDataInfo.y2 = pageHeight - Math.round((float)at.getTranslateY() - y);
- lineDataInfo.x2 = pageWidth - Math.round((float)at.getTranslateX() - x - width);
+ lineDataInfo.setX1 ( pageWidth - Math.round((float)at.getTranslateX() - x) );
+ yNew = pageHeight - Math.round((float)at.getTranslateY() - y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( pageWidth - Math.round((float)at.getTranslateX() - x - width) );
break;
case 270:
- lineDataInfo.x1 = pageHeight - Math.round((float)at.getTranslateY() - x);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round((float)at.getTranslateX() + y);
- lineDataInfo.x2 = pageHeight - Math.round((float)at.getTranslateY() - x - width);
+ lineDataInfo.setX1 ( pageHeight - Math.round((float)at.getTranslateY() - x) );
+ yNew = Math.round((float)at.getTranslateX() + y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( pageHeight - Math.round((float)at.getTranslateY() - x - width) );
break;
}
dataStream.createLine(lineDataInfo);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPStreamer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPStreamer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPStreamer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AFPStreamer.java Tue Aug 17 18:57:04 2010
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.afp.modca.ResourceGroup;
import org.apache.fop.afp.modca.StreamedResourceGroup;
@@ -39,7 +40,7 @@ import org.apache.fop.afp.modca.Streamed
*/
public class AFPStreamer implements Streamable {
/** Static logging instance */
- private static final Log log = LogFactory.getLog(AFPStreamer.class);
+ private static final Log LOG = LogFactory.getLog(AFPStreamer.class);
private static final String AFPDATASTREAM_TEMP_FILE_PREFIX = "AFPDataStream_";
@@ -119,7 +120,7 @@ public class AFPStreamer implements Stre
if (level.isExternal()) {
String filePath = level.getExternalFilePath();
if (filePath == null) {
- log.warn("No file path provided for external resource, using default.");
+ LOG.warn("No file path provided for external resource, using default.");
filePath = defaultResourceGroupFilePath;
}
resourceGroup = (ResourceGroup)pathResourceGroupMap.get(filePath);
@@ -128,7 +129,7 @@ public class AFPStreamer implements Stre
try {
os = new BufferedOutputStream(new FileOutputStream(filePath));
} catch (FileNotFoundException fnfe) {
- log.error("Failed to create/open external resource group file '"
+ LOG.error("Failed to create/open external resource group file '"
+ filePath + "'");
} finally {
if (os != null) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AbstractAFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AbstractAFPPainter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AbstractAFPPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/AbstractAFPPainter.java Tue Aug 17 18:57:04 2010
@@ -32,7 +32,9 @@ public abstract class AbstractAFPPainter
/** Static logging instance */
protected static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ /** data stream */
protected final DataStream dataStream;
+ /** painting state */
protected final AFPPaintingState paintingState;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java Tue Aug 17 18:57:04 2010
@@ -30,8 +30,8 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.afp.fonts.AFPFontAttributes;
import org.apache.fop.afp.fonts.AFPFont;
+import org.apache.fop.afp.fonts.AFPFontAttributes;
import org.apache.fop.afp.fonts.CharacterSet;
import org.apache.fop.afp.modca.AbstractPageObject;
import org.apache.fop.afp.modca.Document;
@@ -42,10 +42,10 @@ import org.apache.fop.afp.modca.PageObje
import org.apache.fop.afp.modca.ResourceGroup;
import org.apache.fop.afp.modca.TagLogicalElementBean;
import org.apache.fop.afp.modca.triplets.FullyQualifiedNameTriplet;
-import org.apache.fop.afp.ptoca.PtocaProducer;
import org.apache.fop.afp.ptoca.PtocaBuilder;
-import org.apache.fop.util.CharUtilities;
+import org.apache.fop.afp.ptoca.PtocaProducer;
import org.apache.fop.fonts.Font;
+import org.apache.fop.util.CharUtilities;
/**
* A data stream is a continuous ordered stream of data elements and objects
@@ -65,7 +65,7 @@ import org.apache.fop.fonts.Font;
public class DataStream {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ protected static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** Boolean completion indicator */
private boolean complete = false;
@@ -162,7 +162,7 @@ public class DataStream {
public void endDocument() throws IOException {
if (complete) {
String msg = "Invalid state - document already ended.";
- log.warn("endDocument():: " + msg);
+ LOG.warn("endDocument():: " + msg);
throw new IllegalStateException(msg);
}
@@ -356,11 +356,12 @@ public class DataStream {
* @param letterSpacing letter spacing to draw text with
* @param wordSpacing word Spacing to draw text with
* @param font is the font to draw text with
- * @param charSet is the AFP Character Set to use with the text
+ * @param charSet is the AFP Character Set to use with the text
* @throws UnsupportedEncodingException thrown if character encoding is not supported
*/
- public void createText(final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
- final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
+ public void createText
+ ( final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
+ final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
int rotation = paintingState.getRotation();
if (rotation != 0) {
textDataInfo.setRotation(rotation);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Factory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Factory.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Factory.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Factory.java Tue Aug 17 18:57:04 2010
@@ -21,8 +21,6 @@ package org.apache.fop.afp;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fop.afp.goca.GraphicsData;
import org.apache.fop.afp.ioca.ImageContent;
import org.apache.fop.afp.ioca.ImageRasterData;
@@ -65,9 +63,6 @@ import org.apache.fop.afp.util.StringUti
*/
public class Factory {
- /** Static logging instance */
- private static final Log log = LogFactory.getLog(Factory.class);
-
private static final String OBJECT_ENVIRONMENT_GROUP_NAME_PREFIX = "OEG";
private static final String ACTIVE_ENVIRONMENT_GROUP_NAME_PREFIX = "AEG";
@@ -541,7 +536,10 @@ public class Factory {
/**
* Creates a new PTOCA {@link PresentationTextDescriptor}
- *
+ * @param width presentation width
+ * @param height presentation height
+ * @param widthRes resolution of presentation width
+ * @param heightRes resolution of presentation height
* @return a new {@link PresentationTextDescriptor}
*/
public PresentationTextDescriptor createPresentationTextDataDescriptor(
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Startable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Startable.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Startable.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/Startable.java Tue Aug 17 18:57:04 2010
@@ -27,7 +27,7 @@ public interface Startable {
/**
* Sets whether or not this object has started or not
*
- * @param complete true if this object has started
+ * @param started true if this object has started
*/
void setStarted(boolean started);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSet.java Tue Aug 17 18:57:04 2010
@@ -21,7 +21,6 @@ package org.apache.fop.afp.fonts;
import java.io.File;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException;
@@ -102,7 +101,8 @@ public class CharacterSet {
* @param encoding the encoding of the font
* @param name the character set name
* @param path the path to the installed afp fonts
- * @deprecated Please use {@link #CharacterSet(String, String, String, URI)} instead.
+ * @deprecated Please use
+ * {@link #CharacterSet(String, String, String, ResourceAccessor)} instead.
*/
public CharacterSet(String codePage, String encoding, String name, String path) {
this(codePage, encoding, name,
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java Tue Aug 17 18:57:04 2010
@@ -114,8 +114,9 @@ public class CharacterSetBuilder {
*/
private final SoftMapCache characterSetsCache = new SoftMapCache(true);
-
- private CharacterSetBuilder() { }
+ /** Default constructor. */
+ protected CharacterSetBuilder() {
+ }
/**
* Factory method for the single-byte implementation of AFPFontReader.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java Tue Aug 17 18:57:04 2010
@@ -279,7 +279,7 @@ public class CharacterSetOrientation {
* Returns the space increment.
* @return the space increment
*/
- public int getSpaceIncrement(){
+ public int getSpaceIncrement() {
return this.spaceIncrement;
}
@@ -295,7 +295,7 @@ public class CharacterSetOrientation {
* Returns the em space increment.
* @return the em space increment
*/
- public int getEmSpaceIncrement(){
+ public int getEmSpaceIncrement() {
return this.emSpaceIncrement;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java Tue Aug 17 18:57:04 2010
@@ -36,7 +36,7 @@ public class DoubleByteFont extends Abst
private static final Set IDEOGRAPHIC = new java.util.HashSet();
static {
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS);
- //IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT); //Java 1.5
+ //IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT);//Java 1.5
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS);
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A);
//IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B); //Java 1.1
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/OutlineFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/OutlineFont.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/OutlineFont.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/OutlineFont.java Tue Aug 17 18:57:04 2010
@@ -24,7 +24,11 @@ package org.apache.fop.afp.fonts;
*/
public class OutlineFont extends AbstractOutlineFont {
- /** {@inheritDoc} */
+ /**
+ * Construct outline font with specified name and character set.
+ * @param name font's name
+ * @param charSet font's character set
+ */
public OutlineFont(String name, CharacterSet charSet) {
super(name, charSet);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/RasterFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/RasterFont.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/RasterFont.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/fonts/RasterFont.java Tue Aug 17 18:57:04 2010
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
public class RasterFont extends AFPFont {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.fop.afp.fonts");
+ protected static final Log LOG = LogFactory.getLog("org.apache.fop.afp.fonts");
private final SortedMap/*<Integer,CharacterSet>*/ charSets
= new java.util.TreeMap/*<Integer,CharacterSet>*/();
@@ -117,7 +117,7 @@ public class RasterFont extends AFPFont
substitutionCharSets.put(requestedSize, csm);
String msg = "No " + (size / 1000f) + "pt font " + getFontName()
+ " found, substituted with " + fontSize.intValue() / 1000f + "pt font";
- log.warn(msg);
+ LOG.warn(msg);
}
}
@@ -125,7 +125,7 @@ public class RasterFont extends AFPFont
// Still no match -> error
String msg = "No font found for font " + getFontName()
+ " with point size " + size / 1000f;
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -144,7 +144,7 @@ public class RasterFont extends AFPFont
return csm.getFirstChar();
} else {
String msg = "getFirstChar() - No character set found for font:" + getFontName();
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
}
@@ -161,7 +161,7 @@ public class RasterFont extends AFPFont
return csm.getLastChar();
} else {
String msg = "getLastChar() - No character set found for font:" + getFontName();
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java Tue Aug 17 18:57:04 2010
@@ -32,6 +32,7 @@ public abstract class AbstractGraphicsCo
/** array of x/y coordinates */
protected int[] coords = null;
+ /** if true, then uses relative drawing order */
protected boolean relative = false;
/**
@@ -51,7 +52,7 @@ public abstract class AbstractGraphicsCo
* Constructor
*
* @param coords the x/y coordinates for this object
- * @param relative
+ * @param relative true if relative drawing order
*/
public AbstractGraphicsCoord(int[] coords, boolean relative) {
this(coords);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java Tue Aug 17 18:57:04 2010
@@ -73,7 +73,6 @@ public final class GraphicsChainedSegmen
return NAME_LENGTH;
}
- /** {@inheritDoc} */
byte getOrderCode() {
return 0x70;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java Tue Aug 17 18:57:04 2010
@@ -52,8 +52,6 @@ public class GraphicsCharacterString ext
* Constructor (relative positioning)
*
* @param str the character string
- * @param x the x coordinate
- * @param y the y coordinate
*/
public GraphicsCharacterString(String str) {
super(null);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsFillet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsFillet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsFillet.java Tue Aug 17 18:57:04 2010
@@ -29,6 +29,7 @@ public final class GraphicsFillet extend
* Constructor
*
* @param coords the x/y coordinates for this object
+ * @param relative true if uses relative drawing order
*/
public GraphicsFillet(int[] coords, boolean relative) {
super(coords, relative);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java Tue Aug 17 18:57:04 2010
@@ -27,7 +27,10 @@ import java.io.OutputStream;
*/
public class GraphicsSetMix extends AbstractGraphicsDrawingOrder {
+ /** default mode */
public static final byte MODE_DEFAULT = 0x00;
+
+ /** overpaint mode */
public static final byte MODE_OVERPAINT = 0x02;
/** the mix mode value */
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java Tue Aug 17 18:57:04 2010
@@ -84,7 +84,7 @@ public class GraphicsSetPatternSymbol ex
/**
* Main constructor
*
- * @param symb the pattern symbol to use
+ * @param pattern the pattern symbol to use
*/
public GraphicsSetPatternSymbol(byte pattern) {
this.pattern = pattern;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java Tue Aug 17 18:57:04 2010
@@ -75,7 +75,7 @@ public class GraphicsSetProcessColor ext
} else if (colSpaceType == ColorSpace.TYPE_RGB) {
colspace = RGB;
} else {
- log.error("unsupported colorspace " + colSpaceType);
+ LOG.error("unsupported colorspace " + colSpaceType);
colspace = RGB;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java Tue Aug 17 18:57:04 2010
@@ -85,9 +85,9 @@ public class IDEStructureParameter imple
}
/**
- * Sets
- * @param numComponents
- * @param bitsPerComponent
+ * Sets uniform bits per component.
+ * @param numComponents the number of components
+ * @param bitsPerComponent number of bits per component
*/
public void setUniformBitsPerComponent(int numComponents, int bitsPerComponent) {
if (bitsPerComponent < 0 || bitsPerComponent >= 256) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java Tue Aug 17 18:57:04 2010
@@ -26,7 +26,10 @@ package org.apache.fop.afp.ioca;
* shades of grey (betweeen 0 and 16) the lower the number being the
* darker the shade. The image data dimensions are 64 x 8.
*/
-public class ImageRasterPattern {
+public final class ImageRasterPattern {
+
+ private ImageRasterPattern() {
+ }
/**
* The Raster Pattern for Greyscale 16
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java Tue Aug 17 18:57:04 2010
@@ -27,6 +27,7 @@ import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.afp.Streamable;
import org.apache.fop.afp.util.BinaryUtils;
@@ -38,11 +39,12 @@ import org.apache.fop.afp.util.BinaryUti
public abstract class AbstractAFPObject implements Streamable {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp.modca");
+ protected static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp.modca");
/** the structured field class id */
protected static final byte SF_CLASS = (byte)0xD3;
+ /** the structure field header */
protected static final byte[] SF_HEADER = new byte[] {
0x5A, // Structured field identifier
0x00, // Length byte 1
@@ -187,7 +189,8 @@ public abstract class AbstractAFPObject
protected String truncate(String str, int maxLength) {
if (str.length() > maxLength) {
str = str.substring(0, maxLength);
- log.warn("truncated character string '" + str + "', longer than " + maxLength + " chars");
+ LOG.warn("truncated character string '"
+ + str + "', longer than " + maxLength + " chars");
}
return str;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java Tue Aug 17 18:57:04 2010
@@ -73,7 +73,7 @@ public abstract class AbstractEnvironmen
mpo.addOverlay(name);
} catch (MaximumSizeExceededException ex) {
// Should never happen (but log just in case)
- log.error("createOverlay():: resulted in a MaximumSizeExceededException");
+ LOG.error("createOverlay():: resulted in a MaximumSizeExceededException");
}
}
}
@@ -88,6 +88,11 @@ public abstract class AbstractEnvironmen
return (MapPageOverlay)getLastElement(this.mapPageOverlays);
}
+ /**
+ * Get last element.
+ * @param list of elements
+ * @return last element or null if none
+ */
protected Object getLastElement(List list) {
if (list != null && list.size() > 0) {
return list.get(list.size() - 1);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java Tue Aug 17 18:57:04 2010
@@ -73,7 +73,7 @@ public abstract class AbstractNamedAFPOb
name = (name + " ").substring(0, afpNameLen);
} else if (name.length() > afpNameLen) {
String truncatedName = name.substring(nameLen - afpNameLen, nameLen);
- log.warn("Constructor:: name '" + name + "'"
+ LOG.warn("Constructor:: name '" + name + "'"
+ " truncated to " + afpNameLen + " chars"
+ " ('" + truncatedName + "')");
name = truncatedName;
@@ -83,7 +83,7 @@ public abstract class AbstractNamedAFPOb
nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
} catch (UnsupportedEncodingException usee) {
nameBytes = name.getBytes();
- log.warn(
+ LOG.warn(
"Constructor:: UnsupportedEncodingException translating the name "
+ name);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractPageObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractPageObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractPageObject.java Tue Aug 17 18:57:04 2010
@@ -166,8 +166,7 @@ public abstract class AbstractPageObject
* Helper method to create text on the current page, this method delegates
* to the presentation text object in order to construct the text.
*
- * @param textDataInfo
- * the afp text data
+ * @param producer the producer
* @throws UnsupportedEncodingException thrown if character encoding is not supported
*/
public void createText(PtocaProducer producer) throws UnsupportedEncodingException {
@@ -258,6 +257,7 @@ public abstract class AbstractPageObject
* the x coordinate of the page segment.
* @param y
* the y coordinate of the page segment.
+ * @param hard true if hard page segment possible
*/
public void createIncludePageSegment(String name, int x, int y, boolean hard) {
IncludePageSegment ips = factory.createIncludePageSegment(name, x, y);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java Tue Aug 17 18:57:04 2010
@@ -27,8 +27,6 @@ import java.util.List;
import org.apache.fop.afp.modca.Registry.ObjectType;
import org.apache.fop.afp.modca.triplets.AbstractTriplet;
-import org.apache.fop.afp.modca.triplets.AttributeQualifierTriplet;
-import org.apache.fop.afp.modca.triplets.AttributeValueTriplet;
import org.apache.fop.afp.modca.triplets.CommentTriplet;
import org.apache.fop.afp.modca.triplets.FullyQualifiedNameTriplet;
import org.apache.fop.afp.modca.triplets.ObjectClassificationTriplet;
@@ -150,7 +148,7 @@ public class AbstractTripletStructuredOb
if (fqNameTriplet != null) {
return fqNameTriplet.getFullyQualifiedName();
}
- log.warn(this + " has no fully qualified name");
+ LOG.warn(this + " has no fully qualified name");
return null;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java Tue Aug 17 18:57:04 2010
@@ -185,7 +185,7 @@ public final class ActiveEnvironmentGrou
mapCodedFont.addFont(fontRef, font, size, orientation);
} catch (MaximumSizeExceededException ex) {
// Should never happen (but log just in case)
- log.error("createFont():: resulted in a MaximumSizeExceededException");
+ LOG.error("createFont():: resulted in a MaximumSizeExceededException");
}
}
}
@@ -205,6 +205,10 @@ public final class ActiveEnvironmentGrou
}
}
+ /**
+ * Add map page segment.
+ * @param name of segment to add
+ */
public void addMapPageSegment(String name) {
try {
needMapPageSegment().addPageSegment(name);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/GraphicsObject.java Tue Aug 17 18:57:04 2010
@@ -98,7 +98,7 @@ public class GraphicsObject extends Abst
getObjectEnvironmentGroup().setDataDescriptor(graphicsDataDescriptor);
}
- /** {@inheritDoc} */
+ /** @param object the structured data */
public void addObject(StructuredData object) {
if (currentData == null) {
newData();
@@ -385,7 +385,11 @@ public class GraphicsObject extends Abst
}
/** the internal graphics state */
- private static class GraphicsState {
+ private static final class GraphicsState {
+
+ private GraphicsState() {
+ }
+
/** the current color */
private Color color;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java Tue Aug 17 18:57:04 2010
@@ -29,8 +29,11 @@ import org.apache.fop.afp.util.BinaryUti
*/
public class ImageDataDescriptor extends AbstractDescriptor {
+ /** function set fs10 */
public static final byte FUNCTION_SET_FS10 = 0x0A;
+ /** function set fs11 */
public static final byte FUNCTION_SET_FS11 = 0x0B;
+ /** function set fs45 */
public static final byte FUNCTION_SET_FS45 = 45;
private byte functionSet = FUNCTION_SET_FS11; // FCNSET = IOCA FS 11
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludeObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludeObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/IncludeObject.java Tue Aug 17 18:57:04 2010
@@ -116,8 +116,9 @@ public class IncludeObject extends Abstr
/**
* Sets the x and y offset of the content area to the object area
- * used in conjunction with the {@link MappingOptionTriplet.POSITION} and
- * {@link MappingOptionTriplet.POSITION_AND_TRIM}.
+ * used in conjunction with the
+ * {@link MappingOptionTriplet#POSITION} and
+ * {@link MappingOptionTriplet#POSITION_AND_TRIM}.
*
* @param x the X-axis origin defined in the object
* @param y the Y-axis origin defined in the object
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapCodedFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapCodedFont.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapCodedFont.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapCodedFont.java Tue Aug 17 18:57:04 2010
@@ -180,7 +180,7 @@ public class MapCodedFont extends Abstra
if (cs == null) {
String msg = "Character set not found for font "
+ font.getFontName() + " with point size " + size;
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -243,7 +243,7 @@ public class MapCodedFont extends Abstra
} else {
String msg = "Font of type " + font.getClass().getName()
+ " not recognized.";
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -264,7 +264,10 @@ public class MapCodedFont extends Abstra
/**
* Private utility class used as a container for font attributes
*/
- private class FontDefinition {
+ private static final class FontDefinition {
+
+ private FontDefinition() {
+ }
/**
* The code page of the font
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageOverlay.java Tue Aug 17 18:57:04 2010
@@ -69,14 +69,14 @@ public class MapPageOverlay extends Abst
throw new IllegalArgumentException("The name of overlay " + name
+ " must be 8 characters");
}
- if (log.isDebugEnabled()) {
- log.debug("addOverlay():: adding overlay " + name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("addOverlay():: adding overlay " + name);
}
try {
byte[] data = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
getOverlays().add(data);
} catch (UnsupportedEncodingException usee) {
- log.error("addOverlay():: UnsupportedEncodingException translating the name "
+ LOG.error("addOverlay():: UnsupportedEncodingException translating the name "
+ name);
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageSegment.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/MapPageSegment.java Tue Aug 17 18:57:04 2010
@@ -67,8 +67,8 @@ public class MapPageSegment extends Abst
throw new IllegalArgumentException("The name of page segment " + name
+ " must not be longer than 8 characters");
}
- if (log.isDebugEnabled()) {
- log.debug("addPageSegment():: adding page segment " + name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("addPageSegment():: adding page segment " + name);
}
getPageSegments().add(name);
}
@@ -124,7 +124,7 @@ public class MapPageSegment extends Abst
byte[] nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
System.arraycopy(nameBytes, 0, data, pos, nameBytes.length);
} catch (UnsupportedEncodingException usee) {
- log.error("UnsupportedEncodingException translating the name "
+ LOG.error("UnsupportedEncodingException translating the name "
+ name);
}
pos += 8;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java Tue Aug 17 18:57:04 2010
@@ -113,9 +113,9 @@ public class ObjectContainer extends Abs
}
/**
- * Sets the inputstream for the the object container data
+ * Sets the data for the the object container
*
- * @param inputStream the inputstream for the object container data
+ * @param data a byte array
*/
public void setData(byte[] data) {
this.data = data;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageGroup.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PageGroup.java Tue Aug 17 18:57:04 2010
@@ -100,6 +100,7 @@ public class PageGroup extends AbstractR
return this.getName();
}
+ /** @return the TLE sequence number */
public int getTleSequence() {
return tleSequence;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java Tue Aug 17 18:57:04 2010
@@ -60,9 +60,13 @@ public class PreprocessPresentationObjec
}
}
+ /** 0 degrees orientation */
public static final byte ORIENTATION_ZERO_DEGREES = 1;
+ /** 90 degrees orientation */
public static final byte ORIENTATION_90_DEGREES = 2;
+ /** 180 degrees orientation */
public static final byte ORIENTATION_180_DEGREES = 4;
+ /** 270 degrees orientation */
public static final byte ORIENTATION_270_DEGREES = 8;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java Tue Aug 17 18:57:04 2010
@@ -31,6 +31,11 @@ public class CommentTriplet extends Abst
private final String commentString;
+ /**
+ * Construct a triplet.
+ * @param id the triplet identification number
+ * @param commentString a comment
+ */
public CommentTriplet(byte id, String commentString) {
super(id);
this.commentString = commentString;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java Tue Aug 17 18:57:04 2010
@@ -182,7 +182,8 @@ public class ObjectClassificationTriplet
data[5] = 0x00; // reserved (must be zero)
// StrucFlgs - Information on the structure of the object container
- byte[] structureFlagsBytes = getStructureFlagsAsBytes(dataInContainer, containerHasOEG, dataInOCD);
+ byte[] structureFlagsBytes
+ = getStructureFlagsAsBytes(dataInContainer, containerHasOEG, dataInOCD);
data[6] = structureFlagsBytes[0];
data[7] = structureFlagsBytes[1];
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/Triplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/Triplet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/Triplet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/triplets/Triplet.java Tue Aug 17 18:57:04 2010
@@ -22,64 +22,123 @@ package org.apache.fop.afp.modca.triplet
import org.apache.fop.afp.Streamable;
import org.apache.fop.afp.StructuredData;
+/**
+ * Triplet interface.
+ */
public interface Triplet extends Streamable, StructuredData {
+
+ /** maximum length */
int MAX_LENGTH = 254;
+ /** CODED_GRAPHIC_CHARACTER_SET_GLOBAL_IDENTIFIER identifier */
byte CODED_GRAPHIC_CHARACTER_SET_GLOBAL_IDENTIFIER = 0x01;
- /** Triplet identifiers */
+ /** FULLY_QUALIFIED_NAME triplet identifier */
byte FULLY_QUALIFIED_NAME = 0x02;
+ /** MAPPING_OPTION triplet identifier */
byte MAPPING_OPTION = 0x04;
+ /** OBJECT_CLASSIFICATION triplet identifier */
byte OBJECT_CLASSIFICATION = 0x10;
+ /** MODCA_INTERCHANGE_SET triplet identifier */
byte MODCA_INTERCHANGE_SET = 0x18;
+ /** FONT_DESCRIPTOR_SPECIFICATION triplet identifier */
byte FONT_DESCRIPTOR_SPECIFICATION = 0x1F;
+ /** OBJECT_FUNCTION_SET_SPECIFICATION triplet identifier */
byte OBJECT_FUNCTION_SET_SPECIFICATION = 0x21;
+ /** EXTENDED_RESOURCE_LOCAL_IDENTIFIER triplet identifier */
byte EXTENDED_RESOURCE_LOCAL_IDENTIFIER = 0x22;
+ /** RESOURCE_LOCAL_IDENTIFIER triplet identifier */
byte RESOURCE_LOCAL_IDENTIFIER = 0x24;
+ /** RESOURCE_SECTION_NUMBER triplet identifier */
byte RESOURCE_SECTION_NUMBER = 0x25;
+ /** CHARACTER_ROTATION triplet identifier */
byte CHARACTER_ROTATION = 0x26;
+ /** OBJECT_BYTE_OFFSET triplet identifier */
byte OBJECT_BYTE_OFFSET = 0x2D;
+ /** ATTRIBUTE_VALUE triplet identifier */
byte ATTRIBUTE_VALUE = 0x36;
+ /** DESCRIPTOR_POSITION triplet identifier */
byte DESCRIPTOR_POSITION = 0x43;
+ /** MEDIA_EJECT_CONTROL triplet identifier */
byte MEDIA_EJECT_CONTROL = 0x45;
+ /** PAGE_OVERLAY_CONDITIONAL_PROCESSING triplet identifier */
byte PAGE_OVERLAY_CONDITIONAL_PROCESSING = 0x46;
+ /** RESOURCE_USAGE_ATTRIBUTE triplet identifier */
byte RESOURCE_USAGE_ATTRIBUTE = 0x47;
+ /** MEASUREMENT_UNITS triplet identifier */
byte MEASUREMENT_UNITS = 0x4B;
+ /** OBJECT_AREA_SIZE triplet identifier */
byte OBJECT_AREA_SIZE = 0x4C;
+ /** AREA_DEFINITION triplet identifier */
byte AREA_DEFINITION = 0x4D;
+ /** COLOR_SPECIFICATION triplet identifier */
byte COLOR_SPECIFICATION = 0x4E;
+ /** ENCODING_SCHEME_ID triplet identifier */
byte ENCODING_SCHEME_ID = 0x50;
+ /** MEDIUM_MAP_PAGE_NUMBER triplet identifier */
byte MEDIUM_MAP_PAGE_NUMBER = 0x56;
+ /** OBJECT_BYTE_EXTENT triplet identifier */
byte OBJECT_BYTE_EXTENT = 0x57;
+ /** OBJECT_STRUCTURED_FIELD_OFFSET triplet identifier */
byte OBJECT_STRUCTURED_FIELD_OFFSET = 0x58;
+ /** OBJECT_STRUCTURED_FIELD_EXTENT triplet identifier */
byte OBJECT_STRUCTURED_FIELD_EXTENT = 0x59;
+ /** OBJECT_OFFSET triplet identifier */
byte OBJECT_OFFSET = 0x5A;
+ /** FONT_HORIZONTAL_SCALE_FACTOR triplet identifier */
byte FONT_HORIZONTAL_SCALE_FACTOR = 0x5D;
+ /** OBJECT_COUNT triplet identifier */
byte OBJECT_COUNT = 0x5E;
+ /** OBJECT_DATE_AND_TIMESTAMP triplet identifier */
byte OBJECT_DATE_AND_TIMESTAMP = 0x62;
+ /** COMMENT triplet identifier */
byte COMMENT = 0x65;
+ /** MEDIUM_ORIENTATION triplet identifier */
byte MEDIUM_ORIENTATION = 0x68;
+ /** RESOURCE_OBJECT_INCLUDE triplet identifier */
byte RESOURCE_OBJECT_INCLUDE = 0x6C;
+ /** PRESENTATION_SPACE_RESET_MIXING triplet identifier */
byte PRESENTATION_SPACE_RESET_MIXING = 0x70;
+ /** PRESENTATION_SPACE_MIXING_RULE triplet identifier */
byte PRESENTATION_SPACE_MIXING_RULE = 0x71;
+ /** UNIVERSAL_DATE_AND_TIMESTAMP triplet identifier */
byte UNIVERSAL_DATE_AND_TIMESTAMP = 0x72;
+ /** TONER_SAVER triplet identifier */
byte TONER_SAVER = 0x74;
+ /** COLOR_FIDELITY triplet identifier */
byte COLOR_FIDELITY = 0x75;
+ /** FONT_FIDELITY triplet identifier */
byte FONT_FIDELITY = 0x78;
+ /** ATTRIBUTE_QUALIFIER triplet identifier */
byte ATTRIBUTE_QUALIFIER = (byte)0x80;
+ /** PAGE_POSITION_INFORMATION triplet identifier */
byte PAGE_POSITION_INFORMATION = (byte)0x81;
+ /** PARAMETER_VALUE triplet identifier */
byte PARAMETER_VALUE = (byte)0x82;
+ /** PRESENTATION_CONTROL triplet identifier */
byte PRESENTATION_CONTROL = (byte)0x83;
+ /** FONT_RESOLUTION_AND_METRIC_TECHNOLOGY triplet identifier */
byte FONT_RESOLUTION_AND_METRIC_TECHNOLOGY = (byte)0x84;
+ /** FINISHING_OPERATION triplet identifier */
byte FINISHING_OPERATION = (byte)0x85;
+ /** TEXT_FIDELITY triplet identifier */
byte TEXT_FIDELITY = (byte)0x86;
+ /** MEDIA_FIDELITY triplet identifier */
byte MEDIA_FIDELITY = (byte)0x87;
+ /** FINISHING_FIDELITY triplet identifier */
byte FINISHING_FIDELITY = (byte)0x88;
+ /** DATA_OBJECT_FONT_DESCRIPTOR triplet identifier */
byte DATA_OBJECT_FONT_DESCRIPTOR = (byte)0x8B;
+ /** LOCALE_SELECTOR triplet identifier */
byte LOCALE_SELECTOR = (byte)0x8C;
+ /** UP3I_FINISHING_OPERATION triplet identifier */
byte UP3I_FINISHING_OPERATION = (byte)0x8E;
+ /** COLOR_MANAGEMENT_RESOURCE_DESCRIPTOR triplet identifier */
byte COLOR_MANAGEMENT_RESOURCE_DESCRIPTOR = (byte)0x91;
+ /** RENDERING_INTENT triplet identifier */
byte RENDERING_INTENT = (byte)0x95;
+ /** CMR_TAG_FIDELITY triplet identifier */
byte CMR_TAG_FIDELITY = (byte)0x96;
+ /** DEVICE_APPEARANCE triplet identifier */
byte DEVICE_APPEARANCE = (byte)0x97;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java Tue Aug 17 18:57:04 2010
@@ -32,7 +32,7 @@ import org.apache.fop.afp.AFPLineDataInf
public class LineDataInfoProducer implements PtocaProducer, PtocaConstants {
/** Static logging instance */
- private static final Log log = LogFactory.getLog(LineDataInfoProducer.class);
+ private static final Log LOG = LogFactory.getLog(LineDataInfoProducer.class);
private AFPLineDataInfo lineDataInfo;
@@ -61,7 +61,7 @@ public class LineDataInfoProducer implem
} else if (x1 == x2) {
builder.drawBaxisRule(y2 - y1, thickness);
} else {
- log.error("Invalid axis rule: unable to draw line");
+ LOG.error("Invalid axis rule: unable to draw line");
return;
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java Tue Aug 17 18:57:04 2010
@@ -60,22 +60,21 @@ public class AFPBridgeContext extends Ab
/**
* Constructs a new bridge context.
* @param userAgent the user agent
- * @param loader the Document Loader to use for referenced documents.
+ * @param documentLoader the Document Loader to use for referenced documents.
* @param fontInfo the font list for the text painter, may be null
* in which case text is painted as shapes
- * @param linkTransform AffineTransform to properly place links,
- * may be null
* @param imageManager an image manager
* @param imageSessionContext an image session context
* @param linkTransform AffineTransform to properly place links,
* may be null
- * @param an AFPGraphics 2D implementation
+ * @param g2d an AFPGraphics 2D implementation
*/
public AFPBridgeContext(UserAgent userAgent, DocumentLoader documentLoader,
FontInfo fontInfo, ImageManager imageManager,
ImageSessionContext imageSessionContext,
AffineTransform linkTransform, AFPGraphics2D g2d) {
- super(userAgent, documentLoader, fontInfo, imageManager, imageSessionContext, linkTransform);
+ super(userAgent, documentLoader, fontInfo, imageManager,
+ imageSessionContext, linkTransform);
this.g2d = g2d;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org