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/25 18:49:40 UTC
svn commit: r989216 [16/19] - in
/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./
examples/plan/src/org/apache/fop/plan/ lib/
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/ s...
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/GraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/GraphicsConfiguration.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/GraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/GraphicsConfiguration.java Wed Aug 25 16:49:26 2010
@@ -29,9 +29,12 @@ import java.awt.image.VolatileImage;
* for JDK 1.3 because there is no VolatileImage there.
*
*/
-abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
+public abstract class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
/**
+ * @param width of image
+ * @param height of image
+ * @return new volatile image
* @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int)
* @since JDK 1.4
*/
@@ -40,6 +43,10 @@ abstract public class GraphicsConfigurat
}
/**
+ * @param width of image
+ * @param height of image
+ * @param transparency of image
+ * @return new volatile image
* @see java.awt.GraphicsConfiguration#createCompatibleVolatileImage(int, int, int)
* @since JDK 1.5
*/
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeImageHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeImageHandler.java Wed Aug 25 16:49:26 2010
@@ -19,6 +19,7 @@
package org.apache.fop.svg;
+/** native image handler */
public interface NativeImageHandler {
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeTextPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/NativeTextPainter.java Wed Aug 25 16:49:26 2010
@@ -190,6 +190,10 @@ public abstract class NativeTextPainter
return chars;
}
+ /**
+ * @param runaci an attributed character iterator
+ * @param layout a text span layout
+ */
protected final void logTextRun(AttributedCharacterIterator runaci, TextSpanLayout layout) {
if (log.isTraceEnabled()) {
int charCount = runaci.getEndIndex() - runaci.getBeginIndex();
@@ -202,6 +206,12 @@ public abstract class NativeTextPainter
}
}
+ /**
+ * @param ch a character
+ * @param layout a text span layout
+ * @param index an index
+ * @param visibleChar visible character flag
+ */
protected final void logCharacter(char ch, TextSpanLayout layout, int index,
boolean visibleChar) {
if (log.isTraceEnabled()) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFBridgeContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFBridgeContext.java Wed Aug 25 16:49:26 2010
@@ -125,6 +125,7 @@ public class PDFBridgeContext extends Ab
// Make sure any 'sub bridge contexts' also have our bridges.
//TODO There's no matching method in the super-class here
+ /** @return the new bridge context */
public BridgeContext createBridgeContext() {
return new PDFBridgeContext(getUserAgent(), getDocumentLoader(),
fontInfo,
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphics2D.java Wed Aug 25 16:49:26 2010
@@ -67,7 +67,6 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.xmlgraphics.java2d.AbstractGraphics2D;
import org.apache.xmlgraphics.java2d.GraphicContext;
-import org.apache.xmlgraphics.java2d.color.ColorExt;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
@@ -92,6 +91,7 @@ import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.pdf.ImageRawCCITTFaxAdapter;
import org.apache.fop.render.pdf.ImageRawJPEGAdapter;
import org.apache.fop.render.pdf.ImageRenderedAdapter;
+import org.apache.fop.util.ColorExt;
/**
* PDF Graphics 2D.
@@ -776,7 +776,7 @@ public class PDFGraphics2D extends Abstr
* @param fill true if the paint should be set for filling
* @return true if the paint is handled natively, false if the paint should be rasterized
*/
- protected boolean applyPaint(Paint paint, boolean fill) {
+ protected boolean applyPaint(Paint paint, boolean fill) { // CSOK: MethodLength
preparePainting();
if (paint instanceof Color) {
@@ -1053,6 +1053,11 @@ public class PDFGraphics2D extends Abstr
return true;
}
+ /**
+ * @param paint some paint
+ * @param shape a shape
+ * @return true (always)
+ */
protected boolean applyUnknownPaint(Paint paint, Shape shape) {
preparePainting();
@@ -1200,6 +1205,8 @@ public class PDFGraphics2D extends Abstr
case BasicStroke.CAP_SQUARE:
currentStream.write(2 + " J\n");
break;
+ default:
+ break;
}
int lj = bs.getLineJoin();
@@ -1213,6 +1220,8 @@ public class PDFGraphics2D extends Abstr
case BasicStroke.JOIN_BEVEL:
currentStream.write(2 + " j\n");
break;
+ default:
+ break;
}
float lw = bs.getLineWidth();
currentStream.write(PDFNumber.doubleOut(lw) + " w\n");
@@ -1228,7 +1237,11 @@ public class PDFGraphics2D extends Abstr
drawInnerRenderedImage(key, img, xform);
}
- /** {@inheritDoc} */
+ /**
+ * @param key a key
+ * @param img an image
+ * @param xform a transform
+ */
public void drawInnerRenderedImage(String key, RenderedImage img, AffineTransform xform) {
preparePainting();
PDFXObject xObject = pdfDoc.getXObject(key);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java Wed Aug 25 16:49:26 2010
@@ -33,11 +33,11 @@ import java.awt.image.ColorModel;
*/
class PDFGraphicsConfiguration extends GraphicsConfiguration {
// We use this to get a good colormodel..
- private static final BufferedImage BI_WITH_ALPHA =
- new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
+ private static final BufferedImage BI_WITH_ALPHA
+ = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
// We use this to get a good colormodel..
- private static final BufferedImage BI_WITHOUT_ALPHA =
- new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+ private static final BufferedImage BI_WITHOUT_ALPHA
+ = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
/**
* Construct a buffered image with an alpha channel, unless
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsDevice.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsDevice.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsDevice.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFGraphicsDevice.java Wed Aug 25 16:49:26 2010
@@ -39,7 +39,7 @@ class PDFGraphicsDevice extends Graphics
/**
* Create a new PDF graphics device.
*
- * @param The gc we should reference
+ * @param gc The graphics configuration we should reference
*/
PDFGraphicsDevice(PDFGraphicsConfiguration gc) {
this.gc = gc;
@@ -62,7 +62,7 @@ class PDFGraphicsDevice extends Graphics
* @return an array containing the one graphics configuration
*/
public GraphicsConfiguration[] getConfigurations() {
- return new GraphicsConfiguration[]{ gc };
+ return new GraphicsConfiguration[] {gc};
}
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFTextPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/PDFTextPainter.java Wed Aug 25 16:49:26 2010
@@ -40,7 +40,7 @@ import org.apache.fop.fonts.FontInfo;
import org.apache.fop.util.CharUtilities;
/**
- * Renders the attributed character iterator of a {@link TextNode}.
+ * Renders the attributed character iterator of a {@link org.apache.batik.gvt.TextNode}.
* This class draws the text directly into the PDFGraphics2D so that
* the text is not drawn using shapes which makes the PDF files larger.
* If the text is simple enough to draw then it sets the font and calls
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGEventProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGEventProducer.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ public interface SVGEventProducer extend
/**
* Provider class for the event producer.
*/
- class Provider {
+ final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGUtilities.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGUtilities.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/svg/SVGUtilities.java Wed Aug 25 16:49:26 2010
@@ -34,7 +34,11 @@ import org.apache.batik.util.XMLConstant
/**
* Some utilities for creating svg DOM documents and elements.
*/
-public class SVGUtilities {
+public final class SVGUtilities {
+
+ private SVGUtilities() {
+ }
+
private static final String SVG_NS = SVGDOMImplementation.SVG_NAMESPACE_URI;
/**
@@ -43,7 +47,7 @@ public class SVGUtilities {
* @param height the height of the root svg element
* @return a new SVG Document
*/
- public static final Document createSVGDocument(float width,
+ public static Document createSVGDocument(float width,
float height) {
DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
Document doc = impl.createDocument(SVG_NS, "svg", null);
@@ -60,9 +64,9 @@ public class SVGUtilities {
* @param font the font
* @return the width of the string in the given font
*/
- public static final float getStringWidth(String str, java.awt.Font font) {
- Rectangle2D rect =
- font.getStringBounds(str, 0, str.length(),
+ public static float getStringWidth(String str, java.awt.Font font) {
+ Rectangle2D rect
+ = font.getStringBounds(str, 0, str.length(),
new FontRenderContext(new AffineTransform(),
true, true));
return (float)rect.getWidth();
@@ -74,10 +78,10 @@ public class SVGUtilities {
* @param font the font
* @return the height of the string in the given font
*/
- public static final float getStringHeight(String str,
+ public static float getStringHeight(String str,
java.awt.Font font) {
- Rectangle2D rect =
- font.getStringBounds(str, 0, str.length(),
+ Rectangle2D rect
+ = font.getStringBounds(str, 0, str.length(),
new FontRenderContext(new AffineTransform(),
true, true));
return (float)rect.getHeight();
@@ -89,7 +93,7 @@ public class SVGUtilities {
* @param font the font
* @return the bounds of the string
*/
- public static final Rectangle2D getStringBounds(String str,
+ public static Rectangle2D getStringBounds(String str,
java.awt.Font font) {
return font.getStringBounds(str, 0, str.length(),
new FontRenderContext(new AffineTransform(),
@@ -105,7 +109,7 @@ public class SVGUtilities {
* @param y2 the end y position
* @return the new line element
*/
- public static final Element createLine(Document doc, float x, float y,
+ public static Element createLine(Document doc, float x, float y,
float x2, float y2) {
Element ellipse = doc.createElementNS(SVG_NS, "line");
ellipse.setAttributeNS(null, "x1", "" + x);
@@ -124,7 +128,7 @@ public class SVGUtilities {
* @param ry the y axis radius
* @return the new ellipse element
*/
- public static final Element createEllipse(Document doc, float cx,
+ public static Element createEllipse(Document doc, float cx,
float cy, float rx, float ry) {
Element ellipse = doc.createElementNS(SVG_NS, "ellipse");
ellipse.setAttributeNS(null, "cx", "" + cx);
@@ -140,7 +144,7 @@ public class SVGUtilities {
* @param str the string for the d attribute on the path
* @return the new path element
*/
- public static final Element createPath(Document doc, String str) {
+ public static Element createPath(Document doc, String str) {
Element path = doc.createElementNS(SVG_NS, "path");
path.setAttributeNS(null, "d", str);
return path;
@@ -154,7 +158,7 @@ public class SVGUtilities {
* @param str the string
* @return the new text element
*/
- public static final Element createText(Document doc, float x, float y,
+ public static Element createText(Document doc, float x, float y,
String str) {
Element textGraph = doc.createElementNS(SVG_NS, "text");
textGraph.setAttributeNS(null, "x", "" + x);
@@ -173,7 +177,7 @@ public class SVGUtilities {
* @param height the height of the rectangle
* @return the new rectangle element
*/
- public static final Element createRect(Document doc, float x, float y,
+ public static Element createRect(Document doc, float x, float y,
float width, float height) {
Element border = doc.createElementNS(SVG_NS, "rect");
border.setAttributeNS(null, "x", "" + x);
@@ -188,7 +192,7 @@ public class SVGUtilities {
* @param doc the document to create the element
* @return the new g element
*/
- public static final Element createG(Document doc) {
+ public static Element createG(Document doc) {
Element border = doc.createElementNS(SVG_NS, "g");
return border;
}
@@ -200,7 +204,7 @@ public class SVGUtilities {
* @param id the id of the clipping path
* @return the new clip element
*/
- public static final Element createClip(Document doc, Element els,
+ public static Element createClip(Document doc, Element els,
String id) {
Element border = doc.createElementNS(SVG_NS, "clipPath");
border.setAttributeNS(null, "id", id);
@@ -216,7 +220,7 @@ public class SVGUtilities {
* @param height the height to set on the image
* @return a new image element
*/
- public static final Element createImage(Document doc, String ref,
+ public static Element createImage(Document doc, String ref,
float width, float height) {
Element border = doc.createElementNS(SVG_NS, "image");
border.setAttributeNS(XMLConstants.XLINK_NAMESPACE_URI, "href",
@@ -234,7 +238,7 @@ public class SVGUtilities {
* @param width the width to wrap
* @return the new element containing the wrapped text
*/
- public static final Element wrapText(Document doc, String str,
+ public static Element wrapText(Document doc, String str,
java.awt.Font font, float width) {
Element g = createG(doc);
Element text;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java Wed Aug 25 16:49:26 2010
@@ -62,8 +62,9 @@ public class LineBreakStatus {
/**
* Check whether a line break may happen according to the rules described in
- * the <a href="http://unicode.org/reports/tr14/#Algorithm">Unicode Line Breaking Algorithm</a>.
- * The function returns the line breaking status of the point <em>before</em> the given character.
+ * the <a href="http://unicode.org/reports/tr14/#Algorithm">Unicode Line Breaking
+ * Algorithm</a>. The function returns the line breaking status of the point
+ * <em>before</em> the given character.
* The algorithm is the table-driven algorithm, as described in
* <a href="http://unicode.org/reports/tr14/#PairBasedImplementation">
* Unicode Technical Report #14</a>.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org