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 [6/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/ sr...
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AbstractAFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AbstractAFPPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AbstractAFPPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AbstractAFPPainter.java Wed Aug 25 16:49:26 2010
@@ -32,7 +32,9 @@ public abstract class AbstractAFPPainter
/** Static logging instance */
protected static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ /** data stream */
protected final DataStream dataStream;
+ /** painting state */
protected final AFPPaintingState paintingState;
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/DataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/DataStream.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/DataStream.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/DataStream.java Wed Aug 25 16:49:26 2010
@@ -30,8 +30,8 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.afp.fonts.AFPFontAttributes;
import org.apache.fop.afp.fonts.AFPFont;
+import org.apache.fop.afp.fonts.AFPFontAttributes;
import org.apache.fop.afp.fonts.CharacterSet;
import org.apache.fop.afp.modca.AbstractPageObject;
import org.apache.fop.afp.modca.Document;
@@ -42,10 +42,10 @@ import org.apache.fop.afp.modca.PageObje
import org.apache.fop.afp.modca.ResourceGroup;
import org.apache.fop.afp.modca.TagLogicalElementBean;
import org.apache.fop.afp.modca.triplets.FullyQualifiedNameTriplet;
-import org.apache.fop.afp.ptoca.PtocaProducer;
import org.apache.fop.afp.ptoca.PtocaBuilder;
-import org.apache.fop.util.CharUtilities;
+import org.apache.fop.afp.ptoca.PtocaProducer;
import org.apache.fop.fonts.Font;
+import org.apache.fop.util.CharUtilities;
/**
* A data stream is a continuous ordered stream of data elements and objects
@@ -65,7 +65,7 @@ import org.apache.fop.fonts.Font;
public class DataStream {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ protected static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** Boolean completion indicator */
private boolean complete = false;
@@ -162,7 +162,7 @@ public class DataStream {
public void endDocument() throws IOException {
if (complete) {
String msg = "Invalid state - document already ended.";
- log.warn("endDocument():: " + msg);
+ LOG.warn("endDocument():: " + msg);
throw new IllegalStateException(msg);
}
@@ -356,11 +356,12 @@ public class DataStream {
* @param letterSpacing letter spacing to draw text with
* @param wordSpacing word Spacing to draw text with
* @param font is the font to draw text with
- * @param charSet is the AFP Character Set to use with the text
+ * @param charSet is the AFP Character Set to use with the text
* @throws UnsupportedEncodingException thrown if character encoding is not supported
*/
- public void createText(final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
- final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
+ public void createText
+ ( final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
+ final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
int rotation = paintingState.getRotation();
if (rotation != 0) {
textDataInfo.setRotation(rotation);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Factory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Factory.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Factory.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Factory.java Wed Aug 25 16:49:26 2010
@@ -21,8 +21,6 @@ package org.apache.fop.afp;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.fop.afp.goca.GraphicsData;
import org.apache.fop.afp.ioca.ImageContent;
import org.apache.fop.afp.ioca.ImageRasterData;
@@ -65,9 +63,6 @@ import org.apache.fop.afp.util.StringUti
*/
public class Factory {
- /** Static logging instance */
- private static final Log log = LogFactory.getLog(Factory.class);
-
private static final String OBJECT_ENVIRONMENT_GROUP_NAME_PREFIX = "OEG";
private static final String ACTIVE_ENVIRONMENT_GROUP_NAME_PREFIX = "AEG";
@@ -541,7 +536,10 @@ public class Factory {
/**
* Creates a new PTOCA {@link PresentationTextDescriptor}
- *
+ * @param width presentation width
+ * @param height presentation height
+ * @param widthRes resolution of presentation width
+ * @param heightRes resolution of presentation height
* @return a new {@link PresentationTextDescriptor}
*/
public PresentationTextDescriptor createPresentationTextDataDescriptor(
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Startable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Startable.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Startable.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/Startable.java Wed Aug 25 16:49:26 2010
@@ -27,7 +27,7 @@ public interface Startable {
/**
* Sets whether or not this object has started or not
*
- * @param complete true if this object has started
+ * @param started true if this object has started
*/
void setStarted(boolean started);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSet.java Wed Aug 25 16:49:26 2010
@@ -21,7 +21,6 @@ package org.apache.fop.afp.fonts;
import java.io.File;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException;
@@ -102,7 +101,8 @@ public class CharacterSet {
* @param encoding the encoding of the font
* @param name the character set name
* @param path the path to the installed afp fonts
- * @deprecated Please use {@link #CharacterSet(String, String, String, URI)} instead.
+ * @deprecated Please use
+ * {@link #CharacterSet(String, String, String, ResourceAccessor)} instead.
*/
public CharacterSet(String codePage, String encoding, String name, String path) {
this(codePage, encoding, name,
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java Wed Aug 25 16:49:26 2010
@@ -114,8 +114,9 @@ public class CharacterSetBuilder {
*/
private final SoftMapCache characterSetsCache = new SoftMapCache(true);
-
- private CharacterSetBuilder() { }
+ /** Default constructor. */
+ protected CharacterSetBuilder() {
+ }
/**
* Factory method for the single-byte implementation of AFPFontReader.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java Wed Aug 25 16:49:26 2010
@@ -279,7 +279,7 @@ public class CharacterSetOrientation {
* Returns the space increment.
* @return the space increment
*/
- public int getSpaceIncrement(){
+ public int getSpaceIncrement() {
return this.spaceIncrement;
}
@@ -295,7 +295,7 @@ public class CharacterSetOrientation {
* Returns the em space increment.
* @return the em space increment
*/
- public int getEmSpaceIncrement(){
+ public int getEmSpaceIncrement() {
return this.emSpaceIncrement;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java Wed Aug 25 16:49:26 2010
@@ -36,7 +36,7 @@ public class DoubleByteFont extends Abst
private static final Set IDEOGRAPHIC = new java.util.HashSet();
static {
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS);
- //IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT); //Java 1.5
+ //IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT);//Java 1.5
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS);
IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A);
//IDEOGRAPHIC.add(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B); //Java 1.1
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/OutlineFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/OutlineFont.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/OutlineFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/OutlineFont.java Wed Aug 25 16:49:26 2010
@@ -24,7 +24,11 @@ package org.apache.fop.afp.fonts;
*/
public class OutlineFont extends AbstractOutlineFont {
- /** {@inheritDoc} */
+ /**
+ * Construct outline font with specified name and character set.
+ * @param name font's name
+ * @param charSet font's character set
+ */
public OutlineFont(String name, CharacterSet charSet) {
super(name, charSet);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java Wed Aug 25 16:49:26 2010
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
public class RasterFont extends AFPFont {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.fop.afp.fonts");
+ protected static final Log LOG = LogFactory.getLog("org.apache.fop.afp.fonts");
private final SortedMap/*<Integer,CharacterSet>*/ charSets
= new java.util.TreeMap/*<Integer,CharacterSet>*/();
@@ -117,7 +117,7 @@ public class RasterFont extends AFPFont
substitutionCharSets.put(requestedSize, csm);
String msg = "No " + (size / 1000f) + "pt font " + getFontName()
+ " found, substituted with " + fontSize.intValue() / 1000f + "pt font";
- log.warn(msg);
+ LOG.warn(msg);
}
}
@@ -125,7 +125,7 @@ public class RasterFont extends AFPFont
// Still no match -> error
String msg = "No font found for font " + getFontName()
+ " with point size " + size / 1000f;
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -144,7 +144,7 @@ public class RasterFont extends AFPFont
return csm.getFirstChar();
} else {
String msg = "getFirstChar() - No character set found for font:" + getFontName();
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
}
@@ -161,7 +161,7 @@ public class RasterFont extends AFPFont
return csm.getLastChar();
} else {
String msg = "getLastChar() - No character set found for font:" + getFontName();
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java Wed Aug 25 16:49:26 2010
@@ -32,6 +32,7 @@ public abstract class AbstractGraphicsCo
/** array of x/y coordinates */
protected int[] coords = null;
+ /** if true, then uses relative drawing order */
protected boolean relative = false;
/**
@@ -51,7 +52,7 @@ public abstract class AbstractGraphicsCo
* Constructor
*
* @param coords the x/y coordinates for this object
- * @param relative
+ * @param relative true if relative drawing order
*/
public AbstractGraphicsCoord(int[] coords, boolean relative) {
this(coords);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java Wed Aug 25 16:49:26 2010
@@ -73,7 +73,6 @@ public final class GraphicsChainedSegmen
return NAME_LENGTH;
}
- /** {@inheritDoc} */
byte getOrderCode() {
return 0x70;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java Wed Aug 25 16:49:26 2010
@@ -52,8 +52,6 @@ public class GraphicsCharacterString ext
* Constructor (relative positioning)
*
* @param str the character string
- * @param x the x coordinate
- * @param y the y coordinate
*/
public GraphicsCharacterString(String str) {
super(null);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsFillet.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsFillet.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsFillet.java Wed Aug 25 16:49:26 2010
@@ -29,6 +29,7 @@ public final class GraphicsFillet extend
* Constructor
*
* @param coords the x/y coordinates for this object
+ * @param relative true if uses relative drawing order
*/
public GraphicsFillet(int[] coords, boolean relative) {
super(coords, relative);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java Wed Aug 25 16:49:26 2010
@@ -27,7 +27,10 @@ import java.io.OutputStream;
*/
public class GraphicsSetMix extends AbstractGraphicsDrawingOrder {
+ /** default mode */
public static final byte MODE_DEFAULT = 0x00;
+
+ /** overpaint mode */
public static final byte MODE_OVERPAINT = 0x02;
/** the mix mode value */
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java Wed Aug 25 16:49:26 2010
@@ -84,7 +84,7 @@ public class GraphicsSetPatternSymbol ex
/**
* Main constructor
*
- * @param symb the pattern symbol to use
+ * @param pattern the pattern symbol to use
*/
public GraphicsSetPatternSymbol(byte pattern) {
this.pattern = pattern;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java Wed Aug 25 16:49:26 2010
@@ -75,7 +75,7 @@ public class GraphicsSetProcessColor ext
} else if (colSpaceType == ColorSpace.TYPE_RGB) {
colspace = RGB;
} else {
- log.error("unsupported colorspace " + colSpaceType);
+ LOG.error("unsupported colorspace " + colSpaceType);
colspace = RGB;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java Wed Aug 25 16:49:26 2010
@@ -85,9 +85,9 @@ public class IDEStructureParameter imple
}
/**
- * Sets
- * @param numComponents
- * @param bitsPerComponent
+ * Sets uniform bits per component.
+ * @param numComponents the number of components
+ * @param bitsPerComponent number of bits per component
*/
public void setUniformBitsPerComponent(int numComponents, int bitsPerComponent) {
if (bitsPerComponent < 0 || bitsPerComponent >= 256) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java Wed Aug 25 16:49:26 2010
@@ -26,7 +26,10 @@ package org.apache.fop.afp.ioca;
* shades of grey (betweeen 0 and 16) the lower the number being the
* darker the shade. The image data dimensions are 64 x 8.
*/
-public class ImageRasterPattern {
+public final class ImageRasterPattern {
+
+ private ImageRasterPattern() {
+ }
/**
* The Raster Pattern for Greyscale 16
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java Wed Aug 25 16:49:26 2010
@@ -27,6 +27,7 @@ import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.afp.Streamable;
import org.apache.fop.afp.util.BinaryUtils;
@@ -38,11 +39,12 @@ import org.apache.fop.afp.util.BinaryUti
public abstract class AbstractAFPObject implements Streamable {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp.modca");
+ protected static final Log LOG = LogFactory.getLog("org.apache.xmlgraphics.afp.modca");
/** the structured field class id */
protected static final byte SF_CLASS = (byte)0xD3;
+ /** the structure field header */
protected static final byte[] SF_HEADER = new byte[] {
0x5A, // Structured field identifier
0x00, // Length byte 1
@@ -187,7 +189,8 @@ public abstract class AbstractAFPObject
protected String truncate(String str, int maxLength) {
if (str.length() > maxLength) {
str = str.substring(0, maxLength);
- log.warn("truncated character string '" + str + "', longer than " + maxLength + " chars");
+ LOG.warn("truncated character string '"
+ + str + "', longer than " + maxLength + " chars");
}
return str;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java Wed Aug 25 16:49:26 2010
@@ -73,7 +73,7 @@ public abstract class AbstractEnvironmen
mpo.addOverlay(name);
} catch (MaximumSizeExceededException ex) {
// Should never happen (but log just in case)
- log.error("createOverlay():: resulted in a MaximumSizeExceededException");
+ LOG.error("createOverlay():: resulted in a MaximumSizeExceededException");
}
}
}
@@ -88,6 +88,11 @@ public abstract class AbstractEnvironmen
return (MapPageOverlay)getLastElement(this.mapPageOverlays);
}
+ /**
+ * Get last element.
+ * @param list of elements
+ * @return last element or null if none
+ */
protected Object getLastElement(List list) {
if (list != null && list.size() > 0) {
return list.get(list.size() - 1);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java Wed Aug 25 16:49:26 2010
@@ -73,7 +73,7 @@ public abstract class AbstractNamedAFPOb
name = (name + " ").substring(0, afpNameLen);
} else if (name.length() > afpNameLen) {
String truncatedName = name.substring(nameLen - afpNameLen, nameLen);
- log.warn("Constructor:: name '" + name + "'"
+ LOG.warn("Constructor:: name '" + name + "'"
+ " truncated to " + afpNameLen + " chars"
+ " ('" + truncatedName + "')");
name = truncatedName;
@@ -83,7 +83,7 @@ public abstract class AbstractNamedAFPOb
nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
} catch (UnsupportedEncodingException usee) {
nameBytes = name.getBytes();
- log.warn(
+ LOG.warn(
"Constructor:: UnsupportedEncodingException translating the name "
+ name);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractPageObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractPageObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractPageObject.java Wed Aug 25 16:49:26 2010
@@ -166,8 +166,7 @@ public abstract class AbstractPageObject
* Helper method to create text on the current page, this method delegates
* to the presentation text object in order to construct the text.
*
- * @param textDataInfo
- * the afp text data
+ * @param producer the producer
* @throws UnsupportedEncodingException thrown if character encoding is not supported
*/
public void createText(PtocaProducer producer) throws UnsupportedEncodingException {
@@ -258,6 +257,7 @@ public abstract class AbstractPageObject
* the x coordinate of the page segment.
* @param y
* the y coordinate of the page segment.
+ * @param hard true if hard page segment possible
*/
public void createIncludePageSegment(String name, int x, int y, boolean hard) {
IncludePageSegment ips = factory.createIncludePageSegment(name, x, y);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/AbstractTripletStructuredObject.java Wed Aug 25 16:49:26 2010
@@ -27,8 +27,6 @@ import java.util.List;
import org.apache.fop.afp.modca.Registry.ObjectType;
import org.apache.fop.afp.modca.triplets.AbstractTriplet;
-import org.apache.fop.afp.modca.triplets.AttributeQualifierTriplet;
-import org.apache.fop.afp.modca.triplets.AttributeValueTriplet;
import org.apache.fop.afp.modca.triplets.CommentTriplet;
import org.apache.fop.afp.modca.triplets.FullyQualifiedNameTriplet;
import org.apache.fop.afp.modca.triplets.ObjectClassificationTriplet;
@@ -150,7 +148,7 @@ public class AbstractTripletStructuredOb
if (fqNameTriplet != null) {
return fqNameTriplet.getFullyQualifiedName();
}
- log.warn(this + " has no fully qualified name");
+ LOG.warn(this + " has no fully qualified name");
return null;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java Wed Aug 25 16:49:26 2010
@@ -185,7 +185,7 @@ public final class ActiveEnvironmentGrou
mapCodedFont.addFont(fontRef, font, size, orientation);
} catch (MaximumSizeExceededException ex) {
// Should never happen (but log just in case)
- log.error("createFont():: resulted in a MaximumSizeExceededException");
+ LOG.error("createFont():: resulted in a MaximumSizeExceededException");
}
}
}
@@ -205,6 +205,10 @@ public final class ActiveEnvironmentGrou
}
}
+ /**
+ * Add map page segment.
+ * @param name of segment to add
+ */
public void addMapPageSegment(String name) {
try {
needMapPageSegment().addPageSegment(name);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/GraphicsObject.java Wed Aug 25 16:49:26 2010
@@ -98,7 +98,7 @@ public class GraphicsObject extends Abst
getObjectEnvironmentGroup().setDataDescriptor(graphicsDataDescriptor);
}
- /** {@inheritDoc} */
+ /** @param object the structured data */
public void addObject(StructuredData object) {
if (currentData == null) {
newData();
@@ -385,7 +385,11 @@ public class GraphicsObject extends Abst
}
/** the internal graphics state */
- private static class GraphicsState {
+ private static final class GraphicsState {
+
+ private GraphicsState() {
+ }
+
/** the current color */
private Color color;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java Wed Aug 25 16:49:26 2010
@@ -29,8 +29,11 @@ import org.apache.fop.afp.util.BinaryUti
*/
public class ImageDataDescriptor extends AbstractDescriptor {
+ /** function set fs10 */
public static final byte FUNCTION_SET_FS10 = 0x0A;
+ /** function set fs11 */
public static final byte FUNCTION_SET_FS11 = 0x0B;
+ /** function set fs45 */
public static final byte FUNCTION_SET_FS45 = 45;
private byte functionSet = FUNCTION_SET_FS11; // FCNSET = IOCA FS 11
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/IncludeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/IncludeObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/IncludeObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/IncludeObject.java Wed Aug 25 16:49:26 2010
@@ -116,8 +116,9 @@ public class IncludeObject extends Abstr
/**
* Sets the x and y offset of the content area to the object area
- * used in conjunction with the {@link MappingOptionTriplet.POSITION} and
- * {@link MappingOptionTriplet.POSITION_AND_TRIM}.
+ * used in conjunction with the
+ * {@link MappingOptionTriplet#POSITION} and
+ * {@link MappingOptionTriplet#POSITION_AND_TRIM}.
*
* @param x the X-axis origin defined in the object
* @param y the Y-axis origin defined in the object
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapCodedFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapCodedFont.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapCodedFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapCodedFont.java Wed Aug 25 16:49:26 2010
@@ -180,7 +180,7 @@ public class MapCodedFont extends Abstra
if (cs == null) {
String msg = "Character set not found for font "
+ font.getFontName() + " with point size " + size;
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -243,7 +243,7 @@ public class MapCodedFont extends Abstra
} else {
String msg = "Font of type " + font.getClass().getName()
+ " not recognized.";
- log.error(msg);
+ LOG.error(msg);
throw new FontRuntimeException(msg);
}
@@ -264,7 +264,10 @@ public class MapCodedFont extends Abstra
/**
* Private utility class used as a container for font attributes
*/
- private class FontDefinition {
+ private static final class FontDefinition {
+
+ private FontDefinition() {
+ }
/**
* The code page of the font
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageOverlay.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageOverlay.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageOverlay.java Wed Aug 25 16:49:26 2010
@@ -69,14 +69,14 @@ public class MapPageOverlay extends Abst
throw new IllegalArgumentException("The name of overlay " + name
+ " must be 8 characters");
}
- if (log.isDebugEnabled()) {
- log.debug("addOverlay():: adding overlay " + name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("addOverlay():: adding overlay " + name);
}
try {
byte[] data = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
getOverlays().add(data);
} catch (UnsupportedEncodingException usee) {
- log.error("addOverlay():: UnsupportedEncodingException translating the name "
+ LOG.error("addOverlay():: UnsupportedEncodingException translating the name "
+ name);
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageSegment.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageSegment.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/MapPageSegment.java Wed Aug 25 16:49:26 2010
@@ -67,8 +67,8 @@ public class MapPageSegment extends Abst
throw new IllegalArgumentException("The name of page segment " + name
+ " must not be longer than 8 characters");
}
- if (log.isDebugEnabled()) {
- log.debug("addPageSegment():: adding page segment " + name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("addPageSegment():: adding page segment " + name);
}
getPageSegments().add(name);
}
@@ -124,7 +124,7 @@ public class MapPageSegment extends Abst
byte[] nameBytes = name.getBytes(AFPConstants.EBCIDIC_ENCODING);
System.arraycopy(nameBytes, 0, data, pos, nameBytes.length);
} catch (UnsupportedEncodingException usee) {
- log.error("UnsupportedEncodingException translating the name "
+ LOG.error("UnsupportedEncodingException translating the name "
+ name);
}
pos += 8;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ObjectContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ObjectContainer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ObjectContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ObjectContainer.java Wed Aug 25 16:49:26 2010
@@ -113,9 +113,9 @@ public class ObjectContainer extends Abs
}
/**
- * Sets the inputstream for the the object container data
+ * Sets the data for the the object container
*
- * @param inputStream the inputstream for the object container data
+ * @param data a byte array
*/
public void setData(byte[] data) {
this.data = data;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PageGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PageGroup.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PageGroup.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PageGroup.java Wed Aug 25 16:49:26 2010
@@ -100,6 +100,7 @@ public class PageGroup extends AbstractR
return this.getName();
}
+ /** @return the TLE sequence number */
public int getTleSequence() {
return tleSequence;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java Wed Aug 25 16:49:26 2010
@@ -60,9 +60,13 @@ public class PreprocessPresentationObjec
}
}
+ /** 0 degrees orientation */
public static final byte ORIENTATION_ZERO_DEGREES = 1;
+ /** 90 degrees orientation */
public static final byte ORIENTATION_90_DEGREES = 2;
+ /** 180 degrees orientation */
public static final byte ORIENTATION_180_DEGREES = 4;
+ /** 270 degrees orientation */
public static final byte ORIENTATION_270_DEGREES = 8;
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java Wed Aug 25 16:49:26 2010
@@ -31,6 +31,11 @@ public class CommentTriplet extends Abst
private final String commentString;
+ /**
+ * Construct a triplet.
+ * @param id the triplet identification number
+ * @param commentString a comment
+ */
public CommentTriplet(byte id, String commentString) {
super(id);
this.commentString = commentString;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java Wed Aug 25 16:49:26 2010
@@ -182,7 +182,8 @@ public class ObjectClassificationTriplet
data[5] = 0x00; // reserved (must be zero)
// StrucFlgs - Information on the structure of the object container
- byte[] structureFlagsBytes = getStructureFlagsAsBytes(dataInContainer, containerHasOEG, dataInOCD);
+ byte[] structureFlagsBytes
+ = getStructureFlagsAsBytes(dataInContainer, containerHasOEG, dataInOCD);
data[6] = structureFlagsBytes[0];
data[7] = structureFlagsBytes[1];
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/Triplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/Triplet.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/Triplet.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/triplets/Triplet.java Wed Aug 25 16:49:26 2010
@@ -22,64 +22,123 @@ package org.apache.fop.afp.modca.triplet
import org.apache.fop.afp.Streamable;
import org.apache.fop.afp.StructuredData;
+/**
+ * Triplet interface.
+ */
public interface Triplet extends Streamable, StructuredData {
+
+ /** maximum length */
int MAX_LENGTH = 254;
+ /** CODED_GRAPHIC_CHARACTER_SET_GLOBAL_IDENTIFIER identifier */
byte CODED_GRAPHIC_CHARACTER_SET_GLOBAL_IDENTIFIER = 0x01;
- /** Triplet identifiers */
+ /** FULLY_QUALIFIED_NAME triplet identifier */
byte FULLY_QUALIFIED_NAME = 0x02;
+ /** MAPPING_OPTION triplet identifier */
byte MAPPING_OPTION = 0x04;
+ /** OBJECT_CLASSIFICATION triplet identifier */
byte OBJECT_CLASSIFICATION = 0x10;
+ /** MODCA_INTERCHANGE_SET triplet identifier */
byte MODCA_INTERCHANGE_SET = 0x18;
+ /** FONT_DESCRIPTOR_SPECIFICATION triplet identifier */
byte FONT_DESCRIPTOR_SPECIFICATION = 0x1F;
+ /** OBJECT_FUNCTION_SET_SPECIFICATION triplet identifier */
byte OBJECT_FUNCTION_SET_SPECIFICATION = 0x21;
+ /** EXTENDED_RESOURCE_LOCAL_IDENTIFIER triplet identifier */
byte EXTENDED_RESOURCE_LOCAL_IDENTIFIER = 0x22;
+ /** RESOURCE_LOCAL_IDENTIFIER triplet identifier */
byte RESOURCE_LOCAL_IDENTIFIER = 0x24;
+ /** RESOURCE_SECTION_NUMBER triplet identifier */
byte RESOURCE_SECTION_NUMBER = 0x25;
+ /** CHARACTER_ROTATION triplet identifier */
byte CHARACTER_ROTATION = 0x26;
+ /** OBJECT_BYTE_OFFSET triplet identifier */
byte OBJECT_BYTE_OFFSET = 0x2D;
+ /** ATTRIBUTE_VALUE triplet identifier */
byte ATTRIBUTE_VALUE = 0x36;
+ /** DESCRIPTOR_POSITION triplet identifier */
byte DESCRIPTOR_POSITION = 0x43;
+ /** MEDIA_EJECT_CONTROL triplet identifier */
byte MEDIA_EJECT_CONTROL = 0x45;
+ /** PAGE_OVERLAY_CONDITIONAL_PROCESSING triplet identifier */
byte PAGE_OVERLAY_CONDITIONAL_PROCESSING = 0x46;
+ /** RESOURCE_USAGE_ATTRIBUTE triplet identifier */
byte RESOURCE_USAGE_ATTRIBUTE = 0x47;
+ /** MEASUREMENT_UNITS triplet identifier */
byte MEASUREMENT_UNITS = 0x4B;
+ /** OBJECT_AREA_SIZE triplet identifier */
byte OBJECT_AREA_SIZE = 0x4C;
+ /** AREA_DEFINITION triplet identifier */
byte AREA_DEFINITION = 0x4D;
+ /** COLOR_SPECIFICATION triplet identifier */
byte COLOR_SPECIFICATION = 0x4E;
+ /** ENCODING_SCHEME_ID triplet identifier */
byte ENCODING_SCHEME_ID = 0x50;
+ /** MEDIUM_MAP_PAGE_NUMBER triplet identifier */
byte MEDIUM_MAP_PAGE_NUMBER = 0x56;
+ /** OBJECT_BYTE_EXTENT triplet identifier */
byte OBJECT_BYTE_EXTENT = 0x57;
+ /** OBJECT_STRUCTURED_FIELD_OFFSET triplet identifier */
byte OBJECT_STRUCTURED_FIELD_OFFSET = 0x58;
+ /** OBJECT_STRUCTURED_FIELD_EXTENT triplet identifier */
byte OBJECT_STRUCTURED_FIELD_EXTENT = 0x59;
+ /** OBJECT_OFFSET triplet identifier */
byte OBJECT_OFFSET = 0x5A;
+ /** FONT_HORIZONTAL_SCALE_FACTOR triplet identifier */
byte FONT_HORIZONTAL_SCALE_FACTOR = 0x5D;
+ /** OBJECT_COUNT triplet identifier */
byte OBJECT_COUNT = 0x5E;
+ /** OBJECT_DATE_AND_TIMESTAMP triplet identifier */
byte OBJECT_DATE_AND_TIMESTAMP = 0x62;
+ /** COMMENT triplet identifier */
byte COMMENT = 0x65;
+ /** MEDIUM_ORIENTATION triplet identifier */
byte MEDIUM_ORIENTATION = 0x68;
+ /** RESOURCE_OBJECT_INCLUDE triplet identifier */
byte RESOURCE_OBJECT_INCLUDE = 0x6C;
+ /** PRESENTATION_SPACE_RESET_MIXING triplet identifier */
byte PRESENTATION_SPACE_RESET_MIXING = 0x70;
+ /** PRESENTATION_SPACE_MIXING_RULE triplet identifier */
byte PRESENTATION_SPACE_MIXING_RULE = 0x71;
+ /** UNIVERSAL_DATE_AND_TIMESTAMP triplet identifier */
byte UNIVERSAL_DATE_AND_TIMESTAMP = 0x72;
+ /** TONER_SAVER triplet identifier */
byte TONER_SAVER = 0x74;
+ /** COLOR_FIDELITY triplet identifier */
byte COLOR_FIDELITY = 0x75;
+ /** FONT_FIDELITY triplet identifier */
byte FONT_FIDELITY = 0x78;
+ /** ATTRIBUTE_QUALIFIER triplet identifier */
byte ATTRIBUTE_QUALIFIER = (byte)0x80;
+ /** PAGE_POSITION_INFORMATION triplet identifier */
byte PAGE_POSITION_INFORMATION = (byte)0x81;
+ /** PARAMETER_VALUE triplet identifier */
byte PARAMETER_VALUE = (byte)0x82;
+ /** PRESENTATION_CONTROL triplet identifier */
byte PRESENTATION_CONTROL = (byte)0x83;
+ /** FONT_RESOLUTION_AND_METRIC_TECHNOLOGY triplet identifier */
byte FONT_RESOLUTION_AND_METRIC_TECHNOLOGY = (byte)0x84;
+ /** FINISHING_OPERATION triplet identifier */
byte FINISHING_OPERATION = (byte)0x85;
+ /** TEXT_FIDELITY triplet identifier */
byte TEXT_FIDELITY = (byte)0x86;
+ /** MEDIA_FIDELITY triplet identifier */
byte MEDIA_FIDELITY = (byte)0x87;
+ /** FINISHING_FIDELITY triplet identifier */
byte FINISHING_FIDELITY = (byte)0x88;
+ /** DATA_OBJECT_FONT_DESCRIPTOR triplet identifier */
byte DATA_OBJECT_FONT_DESCRIPTOR = (byte)0x8B;
+ /** LOCALE_SELECTOR triplet identifier */
byte LOCALE_SELECTOR = (byte)0x8C;
+ /** UP3I_FINISHING_OPERATION triplet identifier */
byte UP3I_FINISHING_OPERATION = (byte)0x8E;
+ /** COLOR_MANAGEMENT_RESOURCE_DESCRIPTOR triplet identifier */
byte COLOR_MANAGEMENT_RESOURCE_DESCRIPTOR = (byte)0x91;
+ /** RENDERING_INTENT triplet identifier */
byte RENDERING_INTENT = (byte)0x95;
+ /** CMR_TAG_FIDELITY triplet identifier */
byte CMR_TAG_FIDELITY = (byte)0x96;
+ /** DEVICE_APPEARANCE triplet identifier */
byte DEVICE_APPEARANCE = (byte)0x97;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java Wed Aug 25 16:49:26 2010
@@ -32,7 +32,7 @@ import org.apache.fop.afp.AFPLineDataInf
public class LineDataInfoProducer implements PtocaProducer, PtocaConstants {
/** Static logging instance */
- private static final Log log = LogFactory.getLog(LineDataInfoProducer.class);
+ private static final Log LOG = LogFactory.getLog(LineDataInfoProducer.class);
private AFPLineDataInfo lineDataInfo;
@@ -61,7 +61,7 @@ public class LineDataInfoProducer implem
} else if (x1 == x2) {
builder.drawBaxisRule(y2 - y1, thickness);
} else {
- log.error("Invalid axis rule: unable to draw line");
+ LOG.error("Invalid axis rule: unable to draw line");
return;
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java Wed Aug 25 16:49:26 2010
@@ -60,22 +60,21 @@ public class AFPBridgeContext extends Ab
/**
* Constructs a new bridge context.
* @param userAgent the user agent
- * @param loader the Document Loader to use for referenced documents.
+ * @param documentLoader the Document Loader to use for referenced documents.
* @param fontInfo the font list for the text painter, may be null
* in which case text is painted as shapes
- * @param linkTransform AffineTransform to properly place links,
- * may be null
* @param imageManager an image manager
* @param imageSessionContext an image session context
* @param linkTransform AffineTransform to properly place links,
* may be null
- * @param an AFPGraphics 2D implementation
+ * @param g2d an AFPGraphics 2D implementation
*/
public AFPBridgeContext(UserAgent userAgent, DocumentLoader documentLoader,
FontInfo fontInfo, ImageManager imageManager,
ImageSessionContext imageSessionContext,
AffineTransform linkTransform, AFPGraphics2D g2d) {
- super(userAgent, documentLoader, fontInfo, imageManager, imageSessionContext, linkTransform);
+ super(userAgent, documentLoader, fontInfo, imageManager,
+ imageSessionContext, linkTransform);
this.g2d = g2d;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java Wed Aug 25 16:49:26 2010
@@ -109,7 +109,8 @@ public class AFPGraphicsConfiguration ex
}
}
- private static final Log log = LogFactory.getLog(AFPGraphicsConfiguration.class);
+ private static final Log LOG
+ = LogFactory.getLog(AFPGraphicsConfiguration.class);
private AffineTransform defaultTransform = null;
private AffineTransform normalizingTransform = null;
@@ -121,7 +122,7 @@ public class AFPGraphicsConfiguration ex
* @return the default transform for the configuration
*/
public AffineTransform getDefaultTransform() {
- log.debug("getDefaultTransform()");
+ LOG.debug("getDefaultTransform()");
if (defaultTransform == null) {
defaultTransform = new AffineTransform();
}
@@ -136,7 +137,7 @@ public class AFPGraphicsConfiguration ex
* @return the normalizing transform for the configuration
*/
public AffineTransform getNormalizingTransform() {
- log.debug("getNormalizingTransform()");
+ LOG.debug("getNormalizingTransform()");
if (normalizingTransform == null) {
normalizingTransform = new AffineTransform(2, 0, 0, 2, 0, 0);
}
@@ -145,7 +146,7 @@ public class AFPGraphicsConfiguration ex
/** {@inheritDoc} */
public GraphicsDevice getDevice() {
- log.debug("getDevice()");
+ LOG.debug("getDevice()");
return graphicsDevice;
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextHandler.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextHandler.java Wed Aug 25 16:49:26 2010
@@ -21,7 +21,6 @@ package org.apache.fop.afp.svg;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,13 +33,13 @@ import org.apache.fop.afp.fonts.AFPPageF
import org.apache.fop.afp.modca.GraphicsObject;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.svg.FOPTextHandler;
+import org.apache.fop.svg.FOPTextHandlerAdapter;
/**
* Specialized TextHandler implementation that the AFPGraphics2D class delegates to to paint text
* using AFP GOCA text operations.
*/
-public class AFPTextHandler implements FOPTextHandler {
+public class AFPTextHandler extends FOPTextHandlerAdapter {
/** logging instance */
private static Log log = LogFactory.getLog(AFPTextHandler.class);
@@ -73,7 +72,6 @@ public class AFPTextHandler implements F
* Registers a page font
*
* @param internalFontName the internal font name
- * @param internalFontName the internal font name
* @param fontSize the font size
* @return a font reference
*/
@@ -88,19 +86,13 @@ public class AFPTextHandler implements F
return afpFontAttributes.getFontReference();
}
- /** {@inheritDoc} */
- public void drawString(String text, float x, float y) throws IOException {
- // TODO Remove me after removing the deprecated method in TextHandler.
- throw new UnsupportedOperationException("Deprecated method!");
- }
-
/**
* Add a text string to the current data object of the AFP datastream.
* The text is painted using text operations.
*
* {@inheritDoc}
*/
- public void drawString(Graphics2D g, String str, float x, float y) throws IOException {
+ public void drawString(Graphics2D g, String str, float x, float y) {
if (log.isDebugEnabled()) {
log.debug("drawString() str=" + str + ", x=" + x + ", y=" + y);
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextPainter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/svg/AFPTextPainter.java Wed Aug 25 16:49:26 2010
@@ -26,7 +26,7 @@ import org.apache.fop.svg.AbstractFOPTex
import org.apache.fop.svg.FOPTextHandler;
/**
- * Renders the attributed character iterator of a {@link TextNode}.
+ * Renders the attributed character iterator of some text.
* This class draws the text directly into the AFPGraphics2D so that
* the text is not drawn using shapes.
* 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/afp/util/BinaryUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/BinaryUtils.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/BinaryUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/BinaryUtils.java Wed Aug 25 16:49:26 2010
@@ -27,6 +27,9 @@ import java.io.ByteArrayOutputStream;
*/
public final class BinaryUtils {
+ private BinaryUtils() {
+ }
+
/**
* Convert an int into the corresponding byte array by encoding each
* two hexadecimal digits as a char. This will return a byte array
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/CubicBezierApproximator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/CubicBezierApproximator.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/CubicBezierApproximator.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/CubicBezierApproximator.java Wed Aug 25 16:49:26 2010
@@ -29,7 +29,10 @@ import java.awt.geom.Point2D.Double;
* The various techniques are described here:
* http://www.timotheegroleau.com/Flash/articles/cubic_bezier_in_flash.htm
*/
-public class CubicBezierApproximator {
+public final class CubicBezierApproximator {
+
+ private CubicBezierApproximator() {
+ }
/**
* This method will take in an array containing the x and y coordinates of the four control
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/DTDEntityResolver.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/DTDEntityResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/DTDEntityResolver.java Wed Aug 25 16:49:26 2010
@@ -98,7 +98,7 @@ public class DTDEntityResolver implement
/**
* Returns the URL of a resource on the classpath
- * @param resourceName the path to the resource relative to the root of the
+ * @param resourcePath the path to the resource relative to the root of the
* classpath.
* @return the URL of the required resource
* @throws FontRuntimeException if the resource could not be found.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/StringUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/StringUtils.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/StringUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/util/StringUtils.java Wed Aug 25 16:49:26 2010
@@ -23,7 +23,10 @@ package org.apache.fop.afp.util;
* Library of utility methods useful in dealing with strings.
*
*/
-public class StringUtils {
+public final class StringUtils {
+
+ private StringUtils() {
+ }
/**
* Padds the string to the left with the given character for
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/apps/FopFactoryConfigurator.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/apps/FopFactoryConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/apps/FopFactoryConfigurator.java Wed Aug 25 16:49:26 2010
@@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
import org.apache.xmlgraphics.image.loader.util.Penalty;
-import org.apache.fop.fonts.FontManager;
import org.apache.fop.fonts.FontManagerConfigurator;
import org.apache.fop.util.LogUtil;
@@ -198,9 +197,7 @@ public class FopFactoryConfigurator {
}
// configure font manager
- FontManager fontManager = factory.getFontManager();
- FontManagerConfigurator fontManagerConfigurator = new FontManagerConfigurator(cfg);
- fontManagerConfigurator.configure(fontManager, strict);
+ new FontManagerConfigurator(cfg).configure(factory.getFontManager(), strict);
// configure image loader framework
configureImageLoading(cfg.getChild("image-loading", false), strict);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaEventProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaEventProducer.java Wed Aug 25 16:49:26 2010
@@ -30,7 +30,10 @@ public interface AreaEventProducer exten
/**
* Provider class for the event producer.
*/
- class Provider {
+ static final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeParser.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeParser.java Wed Aug 25 16:49:26 2010
@@ -228,8 +228,13 @@ public class AreaTreeParser {
if (areaStack.size() > 0) {
int pos = areaStack.size() - 1;
Object obj = null;
- while (pos >= 0 && !(clazz.isInstance(obj = areaStack.get(pos)))) {
- pos--;
+ while ( pos >= 0 ) {
+ obj = areaStack.get(pos);
+ if ( clazz.isInstance ( obj ) ) {
+ break;
+ } else {
+ pos--;
+ }
}
if (pos >= 0) {
return (Area)obj;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Block.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Block.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Block.java Wed Aug 25 16:49:26 2010
@@ -58,6 +58,7 @@ public class Block extends BlockParent {
private int stacking = TB;
private int positioning = STACK;
+ /** if true, allow BPD update */
protected transient boolean allowBPDUpdate = true;
// a block with may contain the dominant styling info in
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/DestinationData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/DestinationData.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/DestinationData.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/DestinationData.java Wed Aug 25 16:49:26 2010
@@ -98,7 +98,7 @@ public class DestinationData extends Abs
* object that corresponds to the IDRef
*
* {@inheritDoc} List)
- * @todo check to make sure it works if multiple bookmark-items
+ * @asf.todo check to make sure it works if multiple bookmark-items
* have the same idref
*/
public void resolveIDRef(String id, List pages) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/IDTracker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/IDTracker.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/IDTracker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/IDTracker.java Wed Aug 25 16:49:26 2010
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
*/
public class IDTracker {
- private static final Log log = LogFactory.getLog(IDTracker.class);
+ private static final Log LOG = LogFactory.getLog(IDTracker.class);
// HashMap of ID's whose area is located on one or more consecutive
// PageViewports. Each ID has an arraylist of PageViewports that
@@ -58,8 +58,8 @@ public class IDTracker {
* @param pv a page viewport that contains the area with this ID
*/
public void associateIDWithPageViewport(String id, PageViewport pv) {
- if (log.isDebugEnabled()) {
- log.debug("associateIDWithPageViewport(" + id + ", " + pv + ")");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("associateIDWithPageViewport(" + id + ", " + pv + ")");
}
List pvList = (List) idLocations.get(id);
if (pvList == null) { // first time ID located
@@ -92,8 +92,8 @@ public class IDTracker {
* @param id the id of the object being processed
*/
public void signalPendingID(String id) {
- if (log.isDebugEnabled()) {
- log.debug("signalPendingID(" + id + ")");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("signalPendingID(" + id + ")");
}
unfinishedIDs.add(id);
}
@@ -106,8 +106,8 @@ public class IDTracker {
* @param id the id of the formatting object which was just finished
*/
public void signalIDProcessed(String id) {
- if (log.isDebugEnabled()) {
- log.debug("signalIDProcessed(" + id + ")");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("signalIDProcessed(" + id + ")");
}
alreadyResolvedIDs.add(id);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/LineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/LineArea.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/LineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/LineArea.java Wed Aug 25 16:49:26 2010
@@ -37,7 +37,7 @@ public class LineArea extends Area {
* that can be used in order to re-compute adjustement and / or indents when a
* page-number or a page-number-citation is resolved
*/
- private class LineAdjustingInfo implements Serializable {
+ private final class LineAdjustingInfo implements Serializable {
private int lineAlignment;
private int difference;
private int availableStretch;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Trait.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Trait.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Trait.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Trait.java Wed Aug 25 16:49:26 2010
@@ -34,7 +34,10 @@ import org.apache.fop.util.ColorUtil;
* Area traits used for rendering.
* This class represents an area trait that specifies a value for rendering.
*/
-public class Trait implements Serializable {
+public final class Trait implements Serializable {
+
+ private Trait() {
+ }
/**
* Id reference line, not resolved.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/AbstractTextArea.java Wed Aug 25 16:49:26 2010
@@ -140,12 +140,14 @@ public abstract class AbstractTextArea e
if (textWordSpaceAdjust < 0) {
// from a negative adjustment to a positive one
balancingFactor
- = ((double) textAdjustingInfo.availableStretch / textAdjustingInfo.availableShrink)
+ = ((double) textAdjustingInfo.availableStretch
+ / textAdjustingInfo.availableShrink)
* ((double) lineShrink / lineStretch);
} else {
// from a positive adjustment to a negative one
balancingFactor
- = ((double) textAdjustingInfo.availableShrink / textAdjustingInfo.availableStretch)
+ = ((double) textAdjustingInfo.availableShrink
+ / textAdjustingInfo.availableStretch)
* ((double) lineStretch / lineShrink);
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineArea.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineArea.java Wed Aug 25 16:49:26 2010
@@ -218,6 +218,10 @@ public class InlineArea extends Area {
return false;
}
+ /**
+ * Apply IPD variation.
+ * @param ipdVariation the variation
+ */
public void handleIPDVariation(int ipdVariation) {
increaseIPD(ipdVariation);
notifyIPDVariation(ipdVariation);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/SpaceArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/SpaceArea.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/SpaceArea.java Wed Aug 25 16:49:26 2010
@@ -16,6 +16,7 @@
*/
/* $Id$ */
+
package org.apache.fop.area.inline;
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/WordArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/WordArea.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/WordArea.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/WordArea.java Wed Aug 25 16:49:26 2010
@@ -16,6 +16,7 @@
*/
/* $Id$ */
+
package org.apache.fop.area.inline;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org