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 [14/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/render/afp/AFPForeignAttributeReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java Wed Aug 25 16:49:26 2010
@@ -35,7 +35,7 @@ import org.apache.fop.render.afp.extensi
* Parses any AFP foreign attributes
*/
public class AFPForeignAttributeReader {
- private static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ private static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** the resource-name attribute */
public static final QName RESOURCE_NAME = new QName(
@@ -94,7 +94,7 @@ public class AFPForeignAttributeReader {
= (String)foreignAttributes.get(RESOURCE_GROUP_FILE);
if (resourceGroupFile == null) {
String msg = RESOURCE_GROUP_FILE + " not specified";
- log.error(msg);
+ LOG.error(msg);
throw new UnsupportedOperationException(msg);
}
File resourceExternalGroupFile = new File(resourceGroupFile);
@@ -106,20 +106,20 @@ public class AFPForeignAttributeReader {
} catch (SecurityException ex) {
String msg = "unable to gain write access to external resource file: "
+ resourceGroupFile;
- log.error(msg);
+ LOG.error(msg);
}
try {
boolean exists = resourceExternalGroupFile.exists();
if (exists) {
- log.warn("overwriting external resource file: "
+ LOG.warn("overwriting external resource file: "
+ resourceGroupFile);
}
resourceLevel.setExternalFilePath(resourceGroupFile);
} catch (SecurityException ex) {
String msg = "unable to gain read access to external resource file: "
+ resourceGroupFile;
- log.error(msg);
+ LOG.error(msg);
}
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandler.java Wed Aug 25 16:49:26 2010
@@ -19,10 +19,7 @@
package org.apache.fop.render.afp;
-import java.awt.Point;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
import java.util.Map;
import org.apache.fop.afp.AFPDataObjectInfo;
@@ -44,44 +41,6 @@ public abstract class AFPImageHandler im
= new AFPForeignAttributeReader();
/**
- * Generates an intermediate AFPDataObjectInfo that is later used to construct
- * the appropriate data object in the AFP DataStream.
- *
- * @param rendererImageInfo the renderer image info
- * @return a data object info object
- * @throws IOException thrown if an I/O exception of some sort has occurred.
- */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPDataObjectInfo dataObjectInfo = createDataObjectInfo();
-
- // set resource information
- setResourceInformation(dataObjectInfo,
- rendererImageInfo.getURI(),
- rendererImageInfo.getForeignAttributes());
-
-
- Point origin = rendererImageInfo.getOrigin();
- Rectangle2D position = rendererImageInfo.getPosition();
- int srcX = Math.round(origin.x + (float)position.getX());
- int srcY = Math.round(origin.y + (float)position.getY());
- Rectangle targetRect = new Rectangle(
- srcX,
- srcY,
- (int)Math.round(position.getWidth()),
- (int)Math.round(position.getHeight()));
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
- AFPPaintingState paintingState = afpInfo.getPaintingState();
-
- dataObjectInfo.setObjectAreaInfo(createObjectAreaInfo(paintingState, targetRect));
-
- return dataObjectInfo;
- }
-
- /**
* Sets resource information on the data object info.
* @param dataObjectInfo the data object info instance
* @param uri the image's URI (or null if no URI is available)
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java Wed Aug 25 16:49:26 2010
@@ -49,47 +49,6 @@ public class AFPImageHandlerGraphics2D e
ImageFlavor.GRAPHICS2D
};
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
- ImageGraphics2D imageG2D = (ImageGraphics2D)rendererImageInfo.getImage();
- Graphics2DImagePainter painter = imageG2D.getGraphics2DImagePainter();
-
- if (afpInfo.paintAsBitmap()) {
- int x = afpInfo.getX();
- int y = afpInfo.getY();
- int width = afpInfo.getWidth();
- int height = afpInfo.getHeight();
- AFPPaintingState paintingState = afpInfo.getPaintingState();
- AFPGraphics2DAdapter g2dAdapter = new AFPGraphics2DAdapter(paintingState);
- g2dAdapter.paintImage(painter, rendererContext, x, y, width, height);
- return null;
- } else {
- AFPGraphicsObjectInfo graphicsObjectInfo
- = (AFPGraphicsObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
-
- setDefaultResourceLevel(graphicsObjectInfo, afpInfo.getResourceManager());
-
- // set mime type (unsupported by MOD:CA registry)
- graphicsObjectInfo.setMimeType(MimeConstants.MIME_AFP_GOCA);
-
- // set g2d
- boolean textAsShapes = false;
- AFPGraphics2D g2d = afpInfo.createGraphics2D(textAsShapes);
-
- graphicsObjectInfo.setGraphics2D(g2d);
-
- // set painter
- graphicsObjectInfo.setPainter(painter);
-
- return graphicsObjectInfo;
- }
- }
-
private void setDefaultResourceLevel(AFPGraphicsObjectInfo graphicsObjectInfo,
AFPResourceManager resourceManager) {
AFPResourceInfo resourceInfo = graphicsObjectInfo.getResourceInfo();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java Wed Aug 25 16:49:26 2010
@@ -66,29 +66,10 @@ public class AFPImageHandlerRenderedImag
ImageFlavor.RENDERED_IMAGE
};
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPImageObjectInfo imageObjectInfo
- = (AFPImageObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
-
- setDefaultResourceLevel(imageObjectInfo, afpInfo.getResourceManager());
-
- AFPPaintingState paintingState = afpInfo.getPaintingState();
- ImageRendered imageRendered = (ImageRendered) rendererImageInfo.img;
- Dimension targetSize = new Dimension(afpInfo.getWidth(), afpInfo.getHeight());
-
- updateDataObjectInfo(imageObjectInfo, paintingState, imageRendered, targetSize);
- return imageObjectInfo;
- }
-
- private AFPDataObjectInfo updateDataObjectInfo(AFPImageObjectInfo imageObjectInfo,
- AFPPaintingState paintingState, ImageRendered imageRendered, Dimension targetSize)
- throws IOException {
+ private AFPDataObjectInfo updateDataObjectInfo // CSOK: MethodLength
+ (AFPImageObjectInfo imageObjectInfo,
+ AFPPaintingState paintingState, ImageRendered imageRendered, Dimension targetSize)
+ throws IOException {
long start = System.currentTimeMillis();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java Wed Aug 25 16:49:26 2010
@@ -65,7 +65,7 @@ public class AFPImageHandlerSVG implemen
BatikImageFlavors.SVG_DOM
};
- /** {@inheritDoc} */
+ /** @return a new AFP data object info instance */
protected AFPDataObjectInfo createDataObjectInfo() {
return new AFPGraphicsObjectInfo();
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPInfo.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPInfo.java Wed Aug 25 16:49:26 2010
@@ -256,7 +256,8 @@ public final class AFPInfo {
public boolean strokeText() {
boolean strokeText = false;
if (handlerConfiguration != null) {
- strokeText = handlerConfiguration.getChild("stroke-text", true).getValueAsBoolean(strokeText);
+ strokeText
+ = handlerConfiguration.getChild("stroke-text", true).getValueAsBoolean(strokeText);
}
return strokeText;
}
@@ -286,8 +287,9 @@ public final class AFPInfo {
* @return a newly created AFPGraphics2D
*/
public AFPGraphics2D createGraphics2D(boolean textAsShapes) {
- AFPGraphics2D g2d = new AFPGraphics2D(
- textAsShapes, paintingState, resourceManager, resourceInfo, fontInfo);
+ AFPGraphics2D g2d
+ = new AFPGraphics2D
+ (textAsShapes, paintingState, resourceManager, resourceInfo, fontInfo);
g2d.setGraphicContext(new org.apache.xmlgraphics.java2d.GraphicContext());
return g2d;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPPainter.java Wed Aug 25 16:49:26 2010
@@ -281,7 +281,8 @@ public class AFPPainter extends Abstract
return mpt / 1000f;
}
- protected void drawBorderLine(int x1, int y1, int x2, int y2, boolean horz,
+ protected void drawBorderLine // CSOK: ParameterNumber
+ (int x1, int y1, int x2, int y2, boolean horz,
boolean startOrBefore, int style, Color color) throws IOException {
BorderPaintingInfo borderPaintInfo = new BorderPaintingInfo(
toPoints(x1), toPoints(y1), toPoints(x2), toPoints(y2),
@@ -316,9 +317,9 @@ public class AFPPainter extends Abstract
}
/** {@inheritDoc} */
- public void drawText(int x, int y,
- final int letterSpacing, final int wordSpacing, final int[] dx,
- final String text) throws IFException {
+ public void drawText // CSOK: MethodLength
+ (int x, int y, final int letterSpacing, final int wordSpacing, final int[] dx,
+ final String text) throws IFException {
final int fontSize = this.state.getFontSize();
getPaintingState().setFontSize(fontSize);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java Wed Aug 25 16:49:26 2010
@@ -149,7 +149,7 @@ public class AFPRendererConfigurator ext
* @param encoding character encoding e.g. 'Cp500', 'UnicodeBigUnmarked'
* @param accessor
* @param afpFontCfg
- * @return
+ * @return the created AFPFont
* @throws ConfigurationException
*/
private AFPFont fontFromType(String type, String codepage, String encoding,
@@ -348,27 +348,12 @@ public class AFPRendererConfigurator ext
private static final String IMAGES_MODE_COLOR = "color";
/**
- * Configure the AFP renderer.
+ * Throws an UnsupportedOperationException.
*
- * @param renderer AFP renderer
- * @throws FOPException fop exception
- * @see org.apache.fop.render.PrintRendererConfigurator#configure(Renderer)
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- AFPRenderer afpRenderer = (AFPRenderer)renderer;
-
- try {
- List/*<AFPFontInfo>*/ fontList = buildFontListFromConfiguration(cfg);
- afpRenderer.setFontList(fontList);
- } catch (ConfigurationException e) {
- LogUtil.handleException(log, e,
- userAgent.getFactory().validateUserConfigStrictly());
- }
-
- configure(afpRenderer, cfg);
- }
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(AFPCustomizable customizable, Configuration cfg) throws FOPException {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRenderingContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRenderingContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRenderingContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRenderingContext.java Wed Aug 25 16:49:26 2010
@@ -43,6 +43,7 @@ public class AFPRenderingContext extends
* Main constructor.
* @param userAgent the user agent
* @param resourceManager the resource manager
+ * @param paintingState the painting state
* @param fontInfo the font list
* @param foreignAttributes a map of foreign attributes
*/
@@ -70,6 +71,7 @@ public class AFPRenderingContext extends
return this.resourceManager;
}
+ /** @return painting state */
public AFPPaintingState getPaintingState() {
return this.paintingState;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPSVGHandler.java Wed Aug 25 16:49:26 2010
@@ -174,7 +174,8 @@ public class AFPSVGHandler extends Abstr
return objectAreaInfo;
}
- private AFPGraphicsObjectInfo createGraphicsObjectInfo(AFPPaintingState paintingState, Graphics2DImagePainter painter,
+ private AFPGraphicsObjectInfo createGraphicsObjectInfo
+ (AFPPaintingState paintingState, Graphics2DImagePainter painter,
FOUserAgent userAgent, AFPResourceInfo resourceInfo, AFPGraphics2D g2d) {
AFPGraphicsObjectInfo graphicsObjectInfo = new AFPGraphicsObjectInfo();
@@ -193,6 +194,11 @@ public class AFPSVGHandler extends Abstr
return graphicsObjectInfo;
}
+ /**
+ * @param userAgent a user agent instance
+ * @param g2d a graphics context
+ * @return a bridge context
+ */
public static BridgeContext createBridgeContext(FOUserAgent userAgent, AFPGraphics2D g2d) {
ImageManager imageManager = userAgent.getFactory().getImageManager();
@@ -208,7 +214,7 @@ public class AFPSVGHandler extends Abstr
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof AFPRenderer);
+ return false;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java Wed Aug 25 16:49:26 2010
@@ -44,21 +44,6 @@ import org.apache.fop.render.RenderingCo
public abstract class AbstractAFPImageHandlerRawStream extends AFPImageHandler
implements ImageHandler {
- /** {@inheritDoc} */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPDataObjectInfo dataObjectInfo = super.generateDataObjectInfo(rendererImageInfo);
- ImageRawStream rawStream = (ImageRawStream) rendererImageInfo.getImage();
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
-
- updateDataObjectInfo(dataObjectInfo, rawStream, afpInfo.getResourceManager());
-
- setAdditionalParameters(dataObjectInfo, rawStream);
- return dataObjectInfo;
- }
-
/**
* Sets additional parameters on the image object info being built. By default, this
* method does nothing but it can be overridden to provide additional functionality.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java Wed Aug 25 16:49:26 2010
@@ -19,8 +19,6 @@
package org.apache.fop.render.afp.extensions;
-import java.net.URI;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/AWTRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/AWTRenderer.java Wed Aug 25 16:49:26 2010
@@ -60,10 +60,10 @@ public class AWTRenderer extends Java2DR
public static final String MIME_TYPE = MimeConstants.MIME_FOP_AWT_PREVIEW;
/** flag for debugging */
- public boolean debug;
+ public boolean debug; // CSOK: VisibilityModifier
/** If true, preview dialog is shown. */
- public boolean dialogDisplay = true;
+ public boolean dialogDisplay = true; // CSOK: VisibilityModifier
/** true if the preview dialog should be the main window of the application */
private boolean previewAsMainWindow;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java Wed Aug 25 16:49:26 2010
@@ -106,7 +106,7 @@ public class ImageProxyPanel extends JPa
/**
* Gets the image data and paints it on screen. Will make
* calls to getPageImage as required.
- * @param graphics
+ * @param graphics a graphics context
* @see javax.swing.JComponent#paintComponent(Graphics)
* @see org.apache.fop.render.java2d.Java2DRenderer#getPageImage(int)
*/
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java Wed Aug 25 16:49:26 2010
@@ -17,11 +17,12 @@
/* $Id$ */
+package org.apache.fop.render.awt.viewer;
+
// Originally contributed by:
// Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
// Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
// Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
-package org.apache.fop.render.awt.viewer;
// Java
import java.awt.BorderLayout;
@@ -105,7 +106,8 @@ public class PreviewDialog extends JFram
* @param renderable the Renderable instance that is used to reload/re-render a document
* after modifications.
*/
- public PreviewDialog(FOUserAgent foUserAgent, Renderable renderable) {
+ public PreviewDialog // CSOK: MethodLength
+ (FOUserAgent foUserAgent, Renderable renderable) {
renderer = (AWTRenderer) foUserAgent.getRendererOverride();
this.foUserAgent = foUserAgent;
this.configuredTargetResolution = this.foUserAgent.getTargetResolution();
@@ -579,7 +581,10 @@ public class PreviewDialog extends JFram
}
}
- /** Prints the document */
+ /**
+ * Prints the document.
+ * @param showDialog true if show dialog
+ */
public void startPrinterJob(boolean showDialog) {
//Restore originally configured target resolution
float saveResolution = foUserAgent.getTargetResolution();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ import org.apache.fop.events.EventProduc
public interface BitmapRendererEventProducer extends EventProducer {
/** 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/render/bitmap/TIFFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java Wed Aug 25 16:49:26 2010
@@ -219,10 +219,12 @@ public class TIFFRenderer extends Java2D
}
}
+ /** @param bufferedImageType an image type */
public void setBufferedImageType(int bufferedImageType) {
this.bufferedImageType = bufferedImageType;
}
+ /** @return image writer parameters */
public ImageWriterParams getWriterParams() {
return writerParams;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java Wed Aug 25 16:49:26 2010
@@ -19,9 +19,6 @@
package org.apache.fop.render.intermediate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.fop.apps.FOUserAgent;
/**
@@ -29,9 +26,6 @@ import org.apache.fop.apps.FOUserAgent;
*/
public abstract class AbstractIFDocumentHandler implements IFDocumentHandler {
- /** logging instance */
- private static Log log = LogFactory.getLog(AbstractIFDocumentHandler.class);
-
private IFContext ifContext;
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java Wed Aug 25 16:49:26 2010
@@ -41,7 +41,7 @@ public abstract class BorderPainter {
* @param bpsEnd the border specification on the end side
* @throws IOException if an I/O error occurs while creating the borders
*/
- public void drawBorders(Rectangle borderRect,
+ public void drawBorders(Rectangle borderRect, // CSOK: MethodLength
BorderProps bpsBefore, BorderProps bpsAfter,
BorderProps bpsStart, BorderProps bpsEnd) throws IOException {
int startx = borderRect.x;
@@ -217,8 +217,9 @@ public abstract class BorderPainter {
* @param color the border color
* @throws IOException if an I/O error occurs
*/
- protected abstract void drawBorderLine(int x1, int y1, int x2, int y2,
- boolean horz, boolean startOrBefore, int style, Color color) throws IOException;
+ protected abstract void drawBorderLine // CSOK: ParameterNumber
+ (int x1, int y1, int x2, int y2,
+ boolean horz, boolean startOrBefore, int style, Color color) throws IOException;
/**
* Draws a line/rule.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFConstants.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFConstants.java Wed Aug 25 16:49:26 2010
@@ -33,22 +33,39 @@ public interface IFConstants extends XML
/** XML namespace of the intermediate format. */
String NAMESPACE = "http://xmlgraphics.apache.org/fop/intermediate";
+ /** element name document */
String EL_DOCUMENT = "document";
+ /** element name header */
String EL_HEADER = "header";
+ /** element name trailer */
String EL_TRAILER = "trailer";
+ /** element name page-sequence */
String EL_PAGE_SEQUENCE = "page-sequence";
+ /** element name page */
String EL_PAGE = "page";
+ /** element name page-header */
String EL_PAGE_HEADER = "page-header";
+ /** element name page-trailer */
String EL_PAGE_TRAILER = "page-trailer";
+ /** element name content */
String EL_PAGE_CONTENT = "content";
+ /** element name viewport */
String EL_VIEWPORT = "viewport";
+ /** element name group */
String EL_GROUP = "g";
+ /** element name image */
String EL_IMAGE = "image";
+ /** element name clip-rect */
String EL_CLIP_RECT = "clip-rect";
+ /** element name rect */
String EL_RECT = "rect";
+ /** element name line */
String EL_LINE = "line";
+ /** element name border-rect */
String EL_BORDER_RECT = "border-rect";
+ /** element name font */
String EL_FONT = "font";
+ /** element name text */
String EL_TEXT = "text";
/** Parent element of the logical structure tree. */
String EL_STRUCTURE_TREE = "structure-tree";
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFContentHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFContentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFContentHandler.java Wed Aug 25 16:49:26 2010
@@ -24,62 +24,74 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+/** intermediate format content handler */
public class IFContentHandler implements ContentHandler {
+ /** {@inheritDoc} */
public void characters(char[] arg0, int arg1, int arg2) throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void endDocument() throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void endElement(String arg0, String arg1, String arg2)
throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void endPrefixMapping(String arg0) throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void ignorableWhitespace(char[] arg0, int arg1, int arg2)
throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void processingInstruction(String arg0, String arg1)
throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void setDocumentLocator(Locator arg0) {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void skippedEntity(String arg0) throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void startDocument() throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void startElement(String arg0, String arg1, String arg2,
Attributes arg3) throws SAXException {
// TODO Auto-generated method stub
}
+ /** {@inheritDoc} */
public void startPrefixMapping(String arg0, String arg1)
throws SAXException {
// TODO Auto-generated method stub
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java Wed Aug 25 16:49:26 2010
@@ -45,8 +45,16 @@ public interface IFDocumentNavigationHan
*/
void renderBookmarkTree(BookmarkTree tree) throws IFException;
+ /**
+ * @param link a link
+ * @throws IFException of not caught
+ */
void renderLink(Link link) throws IFException;
+ /**
+ * @param action an action
+ * @throws IFException of not caught
+ */
void addResolvedAction(AbstractAction action) throws IFException;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java Wed Aug 25 16:49:26 2010
@@ -56,6 +56,7 @@ public class IFGraphicContext extends Gr
return new IFGraphicContext(this);
}
+ /** @param group a group */
public void pushGroup(Group group) {
//this.groupDepth++;
this.groupList.add(group);
@@ -64,44 +65,66 @@ public class IFGraphicContext extends Gr
}
}
+ /** @return array of groups */
public Group[] getGroups() {
return (Group[])this.groupList.toArray(new Group[getGroupStackSize()]);
}
+ /** @return array of groups after clearing group list */
public Group[] dropGroups() {
Group[] groups = getGroups();
this.groupList.clear();
return groups;
}
+ /** @return size of group list */
public int getGroupStackSize() {
return this.groupList.size();
}
+ /** a group */
public static class Group {
private AffineTransform[] transforms;
+ /**
+ * Construct a Group.
+ * @param transforms an array of transforms
+ */
public Group(AffineTransform[] transforms) {
this.transforms = transforms;
}
+ /**
+ * Construct a Group.
+ * @param transform a transform
+ */
public Group(AffineTransform transform) {
this(new AffineTransform[] {transform});
}
+ /** Default constructor. */
public Group() {
this(EMPTY_TRANSFORM_ARRAY);
}
+ /** @return array of transforms */
public AffineTransform[] getTransforms() {
return this.transforms;
}
+ /**
+ * @param painter a painter
+ * @throws IFException in not caught
+ */
public void start(IFPainter painter) throws IFException {
painter.startGroup(transforms);
}
+ /**
+ * @param painter a painter
+ * @throws IFException in not caught
+ */
public void end(IFPainter painter) throws IFException {
painter.endGroup();
}
@@ -115,33 +138,50 @@ public class IFGraphicContext extends Gr
}
+ /** a viewport */
public static class Viewport extends Group {
private Dimension size;
private Rectangle clipRect;
+ /**
+ * Construct a viewport.
+ * @param transforms an array of transforms
+ * @param size a dimension
+ * @param clipRect a clip rectangle
+ */
public Viewport(AffineTransform[] transforms, Dimension size, Rectangle clipRect) {
super(transforms);
this.size = size;
this.clipRect = clipRect;
}
+ /**
+ * Construct a viewport.
+ * @param transform a transform
+ * @param size a dimension
+ * @param clipRect a clip rectangle
+ */
public Viewport(AffineTransform transform, Dimension size, Rectangle clipRect) {
this(new AffineTransform[] {transform}, size, clipRect);
}
+ /** @return the viewport's size */
public Dimension getSize() {
return this.size;
}
+ /** @return the clip rectangle */
public Rectangle getClipRect() {
return this.clipRect;
}
+ /** {@inheritDoc} */
public void start(IFPainter painter) throws IFException {
painter.startViewport(getTransforms(), size, clipRect);
}
+ /** {@inheritDoc} */
public void end(IFPainter painter) throws IFException {
painter.endViewport();
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java Wed Aug 25 16:49:26 2010
@@ -1238,7 +1238,8 @@ public class IFRenderer extends Abstract
}
/** {@inheritDoc} */
- protected void drawBorders(float startx, float starty,
+ protected void drawBorders // CSOK: ParameterNumber
+ (float startx, float starty,
float width, float height,
BorderProps bpsBefore, BorderProps bpsAfter,
BorderProps bpsStart, BorderProps bpsEnd) {
@@ -1251,7 +1252,8 @@ public class IFRenderer extends Abstract
}
/** {@inheritDoc} */
- protected void drawBorderLine(float x1, float y1, float x2, float y2, boolean horz,
+ protected void drawBorderLine // CSOK: ParameterNumber
+ (float x1, float y1, float x2, float y2, boolean horz,
boolean startOrBefore, int style, Color col) {
//Simplified implementation that is only used by renderTextDecoration()
//drawBorders() is overridden and uses the Painter's high-level method drawBorderRect()
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFSerializer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFSerializer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFSerializer.java Wed Aug 25 16:49:26 2010
@@ -633,8 +633,11 @@ public class IFSerializer extends Abstra
}
}
- /** {@inheritDoc} */
- protected RenderingContext createRenderingContext() {
+ /**
+ * @return a new rendering context
+ * @throws IllegalStateException unless overridden
+ */
+ protected RenderingContext createRenderingContext() throws IllegalStateException {
throw new IllegalStateException("Should never be called!");
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFState.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFState.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFState.java Wed Aug 25 16:49:26 2010
@@ -21,7 +21,8 @@ package org.apache.fop.render.intermedia
import java.awt.Color;
-public class IFState {
+/** a state class for intermediate format data */
+public final class IFState {
private IFState parent;
@@ -50,22 +51,27 @@ public class IFState {
this.textColor = parent.textColor;
}
+ /** @return create state */
public static IFState create() {
return new IFState();
}
+ /** @return push state */
public IFState push() {
return new IFState(this);
}
+ /** @return pop state */
public IFState pop() {
return this.parent;
}
+ /** @return true if font changed */
public boolean isFontChanged() {
return this.fontChanged;
}
+ /** reset font changed */
public void resetFontChanged() {
this.fontChanged = false;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFUtil.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ import org.apache.fop.util.DecimalFormat
/**
* Utility functions for the intermediate format.
*/
-public class IFUtil {
+public final class IFUtil {
+
+ private IFUtil() {
+ }
private static String format(double value) {
if (value == -0.0) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java Wed Aug 25 16:49:26 2010
@@ -16,6 +16,7 @@
*/
/* $Id$ */
+
package org.apache.fop.render.java2d;
import java.awt.Font;
@@ -29,6 +30,7 @@ import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.apache.fop.fonts.CustomFont;
+import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.fonts.FontType;
import org.apache.fop.fonts.LazyFont;
import org.apache.fop.fonts.Typeface;
@@ -36,7 +38,7 @@ import org.apache.fop.fonts.Typeface;
/**
* FontMetricsMapper that delegates most methods to an underlying
* {@link FontMetrics} instance. This class was designed to allow
- * the underlying {@link java.awt.Font} to be loaded from a
+ * the underlying {@link Font} to be loaded from a
* user-configured file not registered in the current graphics environment.
*/
public class CustomFontMetricsMapper extends Typeface implements FontMetricsMapper {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java Wed Aug 25 16:49:26 2010
@@ -28,7 +28,7 @@ import org.apache.fop.fonts.FontMetrics;
public interface FontMetricsMapper extends FontMetrics {
/**
- * Gets a {@link Font} instance of the font that this
+ * Gets a {@link java.awt.Font} instance of the font that this
* {@link FontMetrics} describes in the desired size.
* @param size font size
* @return font with the desired characteristics.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java Wed Aug 25 16:49:26 2010
@@ -47,6 +47,10 @@ public class Java2DBorderPainter extends
private GeneralPath currentPath = null;
+ /**
+ * Construct a java2d border painter.
+ * @param painter a painter
+ */
public Java2DBorderPainter(Java2DPainter painter) {
this.painter = painter;
}
@@ -60,7 +64,8 @@ public class Java2DBorderPainter extends
}
/** {@inheritDoc} */
- protected void drawBorderLine(int x1, int y1, int x2, int y2, boolean horz,
+ protected void drawBorderLine // CSOK: ParameterNumber
+ (int x1, int y1, int x2, int y2, boolean horz,
boolean startOrBefore, int style, Color color) {
float w = x2 - x1;
float h = y2 - y1;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DPainter.java Wed Aug 25 16:49:26 2010
@@ -33,9 +33,6 @@ import java.util.Stack;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
@@ -54,9 +51,6 @@ import org.apache.fop.util.CharUtilities
*/
public class Java2DPainter extends AbstractIFPainter {
- /** logging instance */
- private static Log log = LogFactory.getLog(Java2DPainter.class);
-
/** the IF context */
protected IFContext ifContext;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Wed Aug 25 16:49:26 2010
@@ -536,7 +536,8 @@ public abstract class Java2DRenderer ext
}
/** {@inheritDoc} */
- protected void drawBorderLine(float x1, float y1, float x2, float y2,
+ protected void drawBorderLine // CSOK: ParameterNumber
+ (float x1, float y1, float x2, float y2,
boolean horz, boolean startOrBefore, int style, Color col) {
Graphics2D g2d = state.getGraph();
float width = x2 - x1;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java Wed Aug 25 16:49:26 2010
@@ -81,16 +81,17 @@ public class Java2DSVGHandler extends Ab
*/
public static class Java2DInfo {
/** see Java2D_STATE */
- public Java2DGraphicsState state;
+ public Java2DGraphicsState state; // CSOK: VisibilityModifier
/** see Java2D_WIDTH */
- public int width;
+ public int width; // CSOK: VisibilityModifier
/** see Java2D_HEIGHT */
- public int height;
+ public int height; // CSOK: VisibilityModifier
/** see Java2D_XPOS */
- public int currentXPosition;
+ public int currentXPosition; // CSOK: VisibilityModifier
/** see Java2D_YPOS */
- public int currentYPosition;
- public boolean paintAsBitmap;
+ public int currentYPosition; // CSOK: VisibilityModifier
+ /** paint as bitmap */
+ public boolean paintAsBitmap; // CSOK: VisibilityModifier
/** {@inheritDoc} */
public String toString() {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DUtil.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DUtil.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ import org.apache.fop.fonts.FontManager;
/**
* Rendering-related utilities for Java2D.
*/
-public class Java2DUtil {
+public final class Java2DUtil {
+
+ private Java2DUtil() {
+ }
/**
* Builds a default {@link FontInfo} object for use with output formats using the Java2D
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/HardcodedFonts.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/HardcodedFonts.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/HardcodedFonts.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/HardcodedFonts.java Wed Aug 25 16:49:26 2010
@@ -28,10 +28,13 @@ import org.apache.commons.logging.LogFac
* This class hold code for selecting a set of hard-coded fonts available in practically all
* PCL implementations. We hope this can be improved in the future.
*/
-class HardcodedFonts {
+final class HardcodedFonts {
+
+ private HardcodedFonts() {
+ }
/** logging instance */
- private static Log log = LogFactory.getLog(HardcodedFonts.class);
+ private static final Log LOG = LogFactory.getLog(HardcodedFonts.class);
/**
* Sets the current font (NOTE: Hard-coded font mappings ATM!)
@@ -58,7 +61,7 @@ class HardcodedFonts {
try {
fontcode = Integer.parseInt(name.substring(1));
} catch (Exception e) {
- log.error(e);
+ LOG.error(e);
}
}
//Note "(ON" selects ISO 8859-1 symbol set as used by PCLGenerator
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLEventProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLEventProducer.java Wed Aug 25 16:49:26 2010
@@ -28,7 +28,10 @@ import org.apache.fop.events.EventProduc
public interface PCLEventProducer extends EventProducer {
/** 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/render/pcl/PCLPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLPainter.java Wed Aug 25 16:49:26 2010
@@ -34,9 +34,6 @@ import java.util.Stack;
import org.w3c.dom.Document;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageProcessingHints;
@@ -65,9 +62,6 @@ import org.apache.fop.util.CharUtilities
*/
public class PCLPainter extends AbstractIFPainter implements PCLConstants {
- /** logging instance */
- private static Log log = LogFactory.getLog(PCLPainter.class);
-
private static final boolean DEBUG = false;
private PCLDocumentHandler parent;
@@ -396,10 +390,11 @@ public class PCLPainter extends Abstract
private static final double SAFETY_MARGIN_FACTOR = 0.05;
- private Rectangle getTextBoundingBox(int x, int y,
- int letterSpacing, int wordSpacing, int[] dx,
- String text,
- Font font, FontMetricsMapper metrics) {
+ private Rectangle getTextBoundingBox // CSOK: ParameterNumber
+ (int x, int y,
+ int letterSpacing, int wordSpacing, int[] dx,
+ String text,
+ Font font, FontMetricsMapper metrics) {
int maxAscent = metrics.getMaxAscent(font.getFontSize()) / 1000;
int descent = metrics.getDescender(font.getFontSize()) / 1000; //is negative
int safetyMargin = (int)(SAFETY_MARGIN_FACTOR * font.getFontSize());
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java Wed Aug 25 16:49:26 2010
@@ -57,20 +57,12 @@ public class PCLRendererConfigurator ext
}
/**
- * Configure the PCL renderer.
+ * Throws an UnsupportedOperationException.
*
- * @param renderer PCL renderer
- * @throws FOPException fop exception
+ * @param renderer not used
*/
- public void configure(Renderer renderer) throws FOPException {
- Configuration cfg = super.getRendererConfig(renderer);
- if (cfg != null) {
- PCLRenderer pclRenderer = (PCLRenderer)renderer;
-
- PCLRenderingUtil pclUtil = pclRenderer.getPCLUtil();
- configure(cfg, pclUtil);
- }
- super.configure(renderer);
+ public void configure(Renderer renderer) {
+ throw new UnsupportedOperationException();
}
private void configure(Configuration cfg, PCLRenderingUtil pclUtil) throws FOPException {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRendererContext.java Wed Aug 25 16:49:26 2010
@@ -19,9 +19,6 @@
package org.apache.fop.render.pcl;
-import org.apache.xmlgraphics.util.QName;
-
-import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RendererContext;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java Wed Aug 25 16:49:26 2010
@@ -41,6 +41,7 @@ public abstract class PCLRenderingContex
* Main constructor.
* @param userAgent the user agent
* @param generator the PCL generator
+ * @param pclUtil rendering utility
*/
public PCLRenderingContext(FOUserAgent userAgent,
PCLGenerator generator, PCLRenderingUtil pclUtil) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java Wed Aug 25 16:49:26 2010
@@ -28,13 +28,12 @@ import org.apache.fop.render.RendererCon
* PCL XML handler for SVG. Uses Apache Batik for SVG processing.
* This handler handles XML for foreign objects when rendering to HP GL/2.
* It renders SVG to HP GL/2 using the PCLGraphics2D.
- * @see PCLGraphics2DAdapter
*/
public class PCLSVGHandler extends AbstractGenericSVGHandler {
/** {@inheritDoc} */
public boolean supportsRenderer(Renderer renderer) {
- return (renderer instanceof PCLRenderer);
+ return false;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java Wed Aug 25 16:49:26 2010
@@ -165,7 +165,7 @@ public abstract class AbstractImageAdapt
return null;
}
- /** {@inheritDoc} */
+ /** @return null (if not overridden) */
public String getSoftMask() {
return null;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/CTMHelper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/CTMHelper.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/CTMHelper.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/CTMHelper.java Wed Aug 25 16:49:26 2010
@@ -33,6 +33,10 @@ import org.apache.fop.pdf.PDFNumber;
* @see org.apache.fop.area.CTM
*/
public final class CTMHelper {
+
+ private CTMHelper() {
+ }
+
/**
* <p>Converts the sourceMatrix to a string for use in the PDFRenderer cm operations.</p>
* <p>For example:
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java Wed Aug 25 16:49:26 2010
@@ -66,7 +66,7 @@ public class ImageRenderedAdapter extend
*/
public ImageRenderedAdapter(ImageRendered image, String key) {
super(image, key);
- this.encodingHelper = new ImageEncodingHelper(image.getRenderedImage());
+ this.encodingHelper = new ImageEncodingHelper(image.getRenderedImage(), true);
}
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java Wed Aug 25 16:49:26 2010
@@ -37,29 +37,39 @@ import org.apache.fop.util.ColorUtil;
public class PDFBorderPainter extends BorderPainter {
/** logging instance */
- private static Log log = LogFactory.getLog(PDFBorderPainter.class);
+ private static final Log LOG = LogFactory.getLog(PDFBorderPainter.class);
private PDFContentGenerator generator;
+ /**
+ * Construct a border painter.
+ * @param generator a pdf content generator
+ */
public PDFBorderPainter(PDFContentGenerator generator) {
this.generator = generator;
}
/** {@inheritDoc} */
- protected void drawBorderLine(int x1, int y1, int x2, int y2, boolean horz,
- boolean startOrBefore, int style, Color col) {
+ protected void drawBorderLine // CSOK: ParameterNumber
+ (int x1, int y1, int x2, int y2, boolean horz,
+ boolean startOrBefore, int style, Color col) {
drawBorderLine(generator, x1 / 1000f, y1 / 1000f, x2 / 1000f, y2 / 1000f,
horz, startOrBefore, style, col);
}
- /** {@inheritDoc} */
- public static void drawBorderLine(PDFContentGenerator generator,
- float x1, float y1, float x2, float y2, boolean horz,
- boolean startOrBefore, int style, Color col) {
+ /**
+ * @param generator pdf content generator
+ * @see BorderPainter#drawBorderLine
+ */
+ public static void drawBorderLine // CSOK: ParameterNumber|MethodLength
+ (PDFContentGenerator generator,
+ float x1, float y1, float x2, float y2, boolean horz, // CSOK: JavadocMethod
+ boolean startOrBefore, int style, Color col) { // CSOK: JavadocMethod
+ float colFactor;
float w = x2 - x1;
float h = y2 - y1;
if ((w < 0) || (h < 0)) {
- log.error("Negative extent received (w=" + w + ", h=" + h
+ LOG.error("Negative extent received (w=" + w + ", h=" + h
+ "). Border won't be painted.");
return;
}
@@ -146,8 +156,7 @@ public class PDFBorderPainter extends Bo
break;
case Constants.EN_GROOVE:
case Constants.EN_RIDGE:
- {
- float colFactor = (style == Constants.EN_GROOVE ? 0.4f : -0.4f);
+ colFactor = (style == Constants.EN_GROOVE ? 0.4f : -0.4f);
generator.add("[] 0 d ");
if (horz) {
Color uppercol = ColorUtil.lightenColor(col, -colFactor);
@@ -181,11 +190,9 @@ public class PDFBorderPainter extends Bo
+ format(xm1 + w3 + w3) + " " + format(y2) + " l S\n");
}
break;
- }
case Constants.EN_INSET:
case Constants.EN_OUTSET:
- {
- float colFactor = (style == Constants.EN_OUTSET ? 0.4f : -0.4f);
+ colFactor = (style == Constants.EN_OUTSET ? 0.4f : -0.4f);
generator.add("[] 0 d ");
Color c = col;
if (horz) {
@@ -204,7 +211,6 @@ public class PDFBorderPainter extends Bo
+ format(xm1) + " " + format(y2) + " l S\n");
}
break;
- }
case Constants.EN_HIDDEN:
break;
default:
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java Wed Aug 25 16:49:26 2010
@@ -115,7 +115,7 @@ public class PDFContentGenerator {
}
/**
- * Returns the {@link PDFState} associated with this instance.
+ * Returns the {@link PDFPaintingState} associated with this instance.
* @return the PDF state
*/
public PDFPaintingState getState() {
@@ -148,14 +148,18 @@ public class PDFContentGenerator {
}
}
- /** {@inheritDoc} */
+ /** Save graphics state. */
protected void saveGraphicsState() {
endTextObject();
currentState.save();
currentStream.add("q\n");
}
- /** {@inheritDoc} */
+ /**
+ * Save graphics state.
+ * @param structElemType an element type
+ * @param sequenceNum a sequence number
+ */
protected void saveGraphicsState(String structElemType, int sequenceNum) {
endTextObject();
currentState.save();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java Wed Aug 25 16:49:26 2010
@@ -51,6 +51,7 @@ import org.apache.fop.render.intermediat
import org.apache.fop.render.intermediate.IFDocumentNavigationHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFPainter;
+import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileExtensionAttachment;
import org.apache.fop.util.XMLUtil;
/**
@@ -292,6 +293,14 @@ public class PDFDocumentHandler extends
} else if (extension instanceof Metadata) {
XMPMetadata wrapper = new XMPMetadata(((Metadata)extension));
pdfUtil.renderXMPMetadata(wrapper);
+ } else if (extension instanceof PDFEmbeddedFileExtensionAttachment) {
+ PDFEmbeddedFileExtensionAttachment embeddedFile
+ = (PDFEmbeddedFileExtensionAttachment)extension;
+ try {
+ pdfUtil.addEmbeddedFile(embeddedFile);
+ } catch (IOException ioe) {
+ throw new IFException("Error adding embedded file: " + embeddedFile.getSrc(), ioe);
+ }
} else {
log.debug("Don't know how to handle extension object. Ignoring: "
+ extension + " (" + extension.getClass().getName() + ")");
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java Wed Aug 25 16:49:26 2010
@@ -166,10 +166,11 @@ public class PDFDocumentNavigationHandle
} else if (action instanceof URIAction) {
URIAction u = (URIAction)action;
assert u.isComplete();
+ String uri = u.getURI();
PDFFactory factory = getPDFDoc().getFactory();
- pdfAction = factory.getExternalAction(u.getURI(), u.isNewWindow());
+ pdfAction = factory.getExternalAction(uri, u.isNewWindow());
if (!pdfAction.hasObjectNumber()) {
- //Some PDF actions a pooled
+ //Some PDF actions are pooled
getPDFDoc().registerObject(pdfAction);
}
this.completeActions.put(action.getID(), pdfAction);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java Wed Aug 25 16:49:26 2010
@@ -21,7 +21,6 @@ package org.apache.fop.render.pdf;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
@@ -31,9 +30,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D;
-import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.AbstractImageHandlerGraphics2D;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
import org.apache.fop.svg.PDFGraphics2D;
@@ -41,37 +38,13 @@ import org.apache.fop.svg.PDFGraphics2D;
/**
* PDFImageHandler implementation which handles Graphics2D images.
*/
-public class PDFImageHandlerGraphics2D extends AbstractImageHandlerGraphics2D
- implements PDFImageHandler {
+public class PDFImageHandlerGraphics2D extends AbstractImageHandlerGraphics2D {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.GRAPHICS2D,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- /*
- ImageGraphics2D imageG2D = (ImageGraphics2D)image;
- renderer.getGraphics2DAdapter().paintImage(imageG2D.getGraphics2DImagePainter(),
- context, origin.x + pos.x, origin.y + pos.y, pos.width, pos.height);
- */
- PDFRenderingContext pdfContext = new PDFRenderingContext(
- context.getUserAgent(),
- renderer.getGenerator(),
- renderer.currentPage,
- renderer.getFontInfo());
- Rectangle effPos = new Rectangle(origin.x + pos.x, origin.y + pos.y, pos.width, pos.height);
- if (context.getUserAgent().isAccessibilityEnabled()) {
- pdfContext.setMarkedContentInfo(renderer.addCurrentImageToStructureTree());
- }
- handleImage(pdfContext, image, effPos);
- return null;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java Wed Aug 25 16:49:26 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,48 +26,22 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
/**
* Image handler implementation which handles CCITT encoded images (CCITT fax group 3/4)
* for PDF output.
*/
-public class PDFImageHandlerRawCCITTFax implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRawCCITTFax implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_CCITTFAX,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRawCCITTFax ccitt = (ImageRawCCITTFax)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRawCCITTFaxAdapter(ccitt, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java Wed Aug 25 16:49:26 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,48 +26,22 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
/**
* Image handler implementation which handles raw JPEG images for PDF output.
*/
-public class PDFImageHandlerRawJPEG implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRawJPEG implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_JPEG,
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRawJPEG jpeg = (ImageRawJPEG)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRawJPEGAdapter(jpeg, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java Wed Aug 25 16:49:26 2010
@@ -19,7 +19,6 @@
package org.apache.fop.render.pdf;
-import java.awt.Point;
import java.awt.Rectangle;
import java.io.IOException;
@@ -27,19 +26,16 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
-import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFImage;
-import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFXObject;
import org.apache.fop.render.ImageHandler;
-import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.pdf.PDFLogicalStructureHandler.MarkedContentInfo;
/**
* Image handler implementation which handles RenderedImage instances for PDF output.
*/
-public class PDFImageHandlerRenderedImage implements PDFImageHandler, ImageHandler {
+public class PDFImageHandlerRenderedImage implements ImageHandler {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.BUFFERED_IMAGE,
@@ -47,29 +43,6 @@ public class PDFImageHandlerRenderedImag
};
/** {@inheritDoc} */
- public PDFXObject generateImage(RendererContext context, Image image,
- Point origin, Rectangle pos)
- throws IOException {
- PDFRenderer renderer = (PDFRenderer)context.getRenderer();
- ImageRendered imageRend = (ImageRendered)image;
- PDFDocument pdfDoc = (PDFDocument)context.getProperty(
- PDFRendererContextConstants.PDF_DOCUMENT);
- PDFResourceContext resContext = (PDFResourceContext)context.getProperty(
- PDFRendererContextConstants.PDF_CONTEXT);
-
- PDFImage pdfimage = new ImageRenderedAdapter(imageRend, image.getInfo().getOriginalURI());
- PDFXObject xobj = pdfDoc.addImage(resContext, pdfimage);
-
- float x = (float)pos.getX() / 1000f;
- float y = (float)pos.getY() / 1000f;
- float w = (float)pos.getWidth() / 1000f;
- float h = (float)pos.getHeight() / 1000f;
- renderer.placeImage(x, y, w, h, xobj);
-
- return xobj;
- }
-
- /** {@inheritDoc} */
public void handleImage(RenderingContext context, Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org