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/27 17:26:27 UTC
svn commit: r990174 - in
/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./
src/java/org/apache/fop/area/ src/java/org/apache/fop/fo/
src/java/org/apache/fop/fo/flow/ src/java/org/apache/fop/fo/flow/table/
src/java/org/apache/fop/fo/pagination/ sr...
Author: vhennebert
Date: Fri Aug 27 15:26:26 2010
New Revision: 990174
URL: http://svn.apache.org/viewvc?rev=990174&view=rev
Log:
Merged changes from Trunk up to revision 990155
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/ (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/DestinationData.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Footnote.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/ListItem.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/MultiCase.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CharacterProperty.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/ByteVector.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/HyphenationException.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/LayoutException.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CellPart.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFCIDFont.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFShading.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSBorderPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 27 15:26:26 2010
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0:959975-964707
-/xmlgraphics/fop/trunk:949179-989185
+/xmlgraphics/fop/trunk:949179-990171
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=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -98,7 +98,7 @@ public class DestinationData extends Abs
* object that corresponds to the IDRef
*
* {@inheritDoc} List)
- * @asf.todo check to make sure it works if multiple bookmark-items
+ * 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/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FOPropertyMapping.java Fri Aug 27 15:26:26 2010
@@ -72,7 +72,7 @@ import org.apache.fop.fo.properties.XMLL
* This class creates and returns an array of Property.Maker instances
* indexed by the PR_* propId from Constants.java.
*
- * @asf.todo Check multi-threading safety of the statics below
+ * TODO Check multi-threading safety of the statics below
*/
public final class FOPropertyMapping implements Constants {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java Fri Aug 27 15:26:26 2010
@@ -255,7 +255,7 @@ public abstract class FObj extends FONod
/**
* Check if this formatting object generates reference areas.
* @return true if generates reference areas
- * @asf.todo see if needed
+ * TODO see if needed
*/
public boolean generatesReferenceAreas() {
return false;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Footnote.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Footnote.java Fri Aug 27 15:26:26 2010
@@ -76,9 +76,9 @@ public class Footnote extends FObj {
/**
* {@inheritDoc}
* <br>XSL Content Model: (inline,footnote-body)
- * @asf.todo implement additional constraint: A fo:footnote is not permitted
+ * TODO implement additional constraint: A fo:footnote is not permitted
* to have a fo:float, fo:footnote, or fo:marker as a descendant.
- * @asf.todo implement additional constraint: A fo:footnote is not
+ * TODO implement additional constraint: A fo:footnote is not
* permitted to have as a descendant a fo:block-container that
* generates an absolutely positioned area.
*/
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java Fri Aug 27 15:26:26 2010
@@ -30,7 +30,7 @@ import org.apache.fop.fo.properties.Leng
* <code>fo:leader</code></a> object.
* The main property of <code>fo:leader</code> is leader-pattern.
* The following patterns are treated: rule, space, dots and use-content.
- * @asf.todo implement validateChildNode()
+ * TODO implement validateChildNode()
*/
public class Leader extends InlineLevel {
// The value of properties relevant for fo:leader.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/ListItem.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/ListItem.java Fri Aug 27 15:26:26 2010
@@ -119,7 +119,7 @@ public class ListItem extends FObj imple
/**
* {@inheritDoc}
- * @asf.todo see if can/should rely on base class for this
+ * TODO see if can/should rely on base class for this
* (i.e., add to childNodes instead)
*/
public void addChildNode(FONode child) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java Fri Aug 27 15:26:26 2010
@@ -110,7 +110,7 @@ public class Marker extends FObjMixed {
* <br><i>Additionally: "An fo:marker may contain any formatting objects that
* are permitted as a replacement of any fo:retrieve-marker that retrieves
* the fo:marker's children."</i>
- * @asf.todo implement "additional" constraint, possibly within fo:retrieve-marker
+ * TODO implement "additional" constraint, possibly within fo:retrieve-marker
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/MultiCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/MultiCase.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/MultiCase.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/MultiCase.java Fri Aug 27 15:26:26 2010
@@ -27,7 +27,7 @@ import org.apache.fop.fo.PropertyList;
/**
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_multi-case">
* <code>fo:multi-case</code></a> object.
- * @asf.todo implement validateChildNode()
+ * TODO implement validateChildNode()
*/
public class MultiCase extends FObj {
// The value of properties relevant for fo:multi-case.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Fri Aug 27 15:26:26 2010
@@ -30,7 +30,7 @@ import org.apache.fop.fo.ValidationExcep
/**
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table-and-caption">
* <code>fo:table-and-caption</code></a> property.
- * @asf.todo needs implementation
+ * TODO needs implementation
*/
public class TableAndCaption extends FObj /*implements BreakPropertySet*/ {
// The value of properties relevant for fo:table-and-caption.
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/pagination/PageSequence.java Fri Aug 27 15:26:26 2010
@@ -151,7 +151,7 @@ public class PageSequence extends Abstra
/**
* {@inheritDoc}
- * @asf.todo see if addChildNode() should also be called for fo's other than
+ * TODO see if addChildNode() should also be called for fo's other than
* fo:flow.
*/
public void addChildNode(FONode child) throws FOPException {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/CharacterProperty.java Fri Aug 27 15:26:26 2010
@@ -24,7 +24,7 @@ import org.apache.fop.fo.PropertyList;
/**
* Superclass for properties that wrap a character value
- * @asf.todo convert character value to int in order to denote unicode scalar value
+ * TODO convert character value to int in order to denote unicode scalar value
* instead of a single UTF-16 code element
*/
public final class CharacterProperty extends Property {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/ByteVector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/ByteVector.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/ByteVector.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/ByteVector.java Fri Aug 27 15:26:26 2010
@@ -69,7 +69,7 @@ public class ByteVector implements Seria
/**
* Construct byte vector instance.
* @param a byte array to use
- * @asf.todo should n should be initialized to a.length to be consistent with
+ * TODO should n should be initialized to a.length to be consistent with
* CharVector behavior? [GA]
*/
public ByteVector(byte[] a) {
@@ -82,7 +82,7 @@ public class ByteVector implements Seria
* Construct byte vector instance.
* @param a byte array to use
* @param capacity initial block size
- * @asf.todo should n should be initialized to a.length to be consistent with
+ * TODO should n should be initialized to a.length to be consistent with
* CharVector behavior? [GA]
*/
public ByteVector(byte[] a, int capacity) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/HyphenationException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/HyphenationException.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/HyphenationException.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/HyphenationException.java Fri Aug 27 15:26:26 2010
@@ -22,7 +22,7 @@ package org.apache.fop.hyphenation;
/**
* An hyphenation exception.
* @author Carlos Villegas <ca...@uniscope.co.jp>
- * @asf.todo Derive from FOPException
+ * TODO Derive from FOPException
*/
public class HyphenationException extends Exception {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java Fri Aug 27 15:26:26 2010
@@ -55,8 +55,8 @@ public class BalancingColumnBreakingAlgo
* @param columnCount number of columns
* @see PageBreakingAlgorithm
*/
- public BalancingColumnBreakingAlgorithm // CSOK: ParameterNumber
- (LayoutManager topLevelLM,
+ public BalancingColumnBreakingAlgorithm( // CSOK: ParameterNumber
+ LayoutManager topLevelLM,
PageProvider pageProvider,
PageBreakingLayoutListener layoutListener,
int alignment, int alignmentLast,
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java Fri Aug 27 15:26:26 2010
@@ -285,11 +285,11 @@ public abstract class BreakingAlgorithm
* @param totalDemerits a real number
* @param previous a node
*/
- public KnuthNode // CSOK: ParameterNumber
- (int position, int line, int fitness,
- int totalWidth, int totalStretch, int totalShrink,
- double adjustRatio, int availableShrink, int availableStretch,
- int difference, double totalDemerits, KnuthNode previous) {
+ public KnuthNode( // CSOK: ParameterNumber
+ int position, int line, int fitness,
+ int totalWidth, int totalStretch, int totalShrink,
+ double adjustRatio, int availableShrink, int availableStretch,
+ int difference, double totalDemerits, KnuthNode previous) {
this.position = position;
this.line = line;
this.fitness = fitness;
@@ -671,11 +671,11 @@ public abstract class BreakingAlgorithm
* @param previous active node for the preceding breakpoint
* @return a new node
*/
- protected KnuthNode createNode // CSOK: ParameterNumber
- (int position, int line, int fitness,
- int totalWidth, int totalStretch, int totalShrink,
- double adjustRatio, int availableShrink, int availableStretch,
- int difference, double totalDemerits, KnuthNode previous) {
+ protected KnuthNode createNode( // CSOK: ParameterNumber
+ int position, int line, int fitness,
+ int totalWidth, int totalStretch, int totalShrink,
+ double adjustRatio, int availableShrink, int availableStretch,
+ int difference, double totalDemerits, KnuthNode previous) {
return new KnuthNode(position, line, fitness,
totalWidth, totalStretch, totalShrink,
adjustRatio, availableShrink, availableStretch,
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -36,7 +36,7 @@ import org.apache.fop.fo.pagination.Flow
* Its parent LM is the PageSequenceLayoutManager.
* This LM is responsible for getting columns of the appropriate size
* and filling them with block-level areas generated by its children.
- * @asf.todo Reintroduce emergency counter (generate error to avoid endless loop)
+ * TODO Reintroduce emergency counter (generate error to avoid endless loop)
*/
public class FlowLayoutManager extends BlockStackingLayoutManager
implements BlockLevelLayoutManager {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/LayoutException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/LayoutException.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/LayoutException.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/LayoutException.java Fri Aug 27 15:26:26 2010
@@ -29,7 +29,7 @@ import org.apache.fop.events.EventExcept
* Exception thrown by FOP if an unrecoverable layout error occurs. An example: An area overflows
* a viewport that has overflow="error-if-overflow".
*
- * @asf.todo Discuss if this should become a checked exception.
+ * TODO Discuss if this should become a checked exception.
*/
public class LayoutException extends RuntimeException {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Fri Aug 27 15:26:26 2010
@@ -514,7 +514,7 @@ class PageBreakingAlgorithm extends Brea
footnoteElementIndex
= getFootnoteList(footnoteListIndex).size() - 1;
} else if (((canDeferOldFN = canDeferOldFootnotes // CSOK: InnerAssignment
- (pageNode, elementIndex))
+ (pageNode, elementIndex))
|| newFootnotes)
&& (footnoteSplit = getFootnoteSplit // CSOK: InnerAssignment
(pageNode, getLineWidth(activeNode.line) - actualWidth,
@@ -1125,7 +1125,7 @@ class PageBreakingAlgorithm extends Brea
*/
protected void addNode(int line, KnuthNode node) {
if (node.position < par.size() - 1 && line > 0
- && (ipdDifference = compareIPDs(line - 1)) != 0) { // CSOK: InnerAssignment
+ && (ipdDifference = compareIPDs(line - 1)) != 0) { // CSOK: InnerAssignment
log.trace("IPD changes at page " + line);
if (bestNodeForIPDChange == null
|| node.totalDemerits < bestNodeForIPDChange.totalDemerits) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -194,9 +194,8 @@ public class CharacterLayoutManager exte
areaInfo.alignmentContext,
notifyPos(new LeafPosition(this, 0)), false));
if (areaInfo.bHyphenated) {
- returnList.add
- (new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
- new LeafPosition(this, -1), false));
+ returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
+ new LeafPosition(this, -1), false));
}
} else {
// adjustable letter space
@@ -207,8 +206,8 @@ public class CharacterLayoutManager exte
new LeafPosition(this, -1), true));
returnList.add(new KnuthGlue(letterSpaceIPD.mult(areaInfo.iLScount),
new LeafPosition(this, -1), true));
- returnList.add
- (new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
+ returnList.add (
+ new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
if (areaInfo.bHyphenated) {
returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
new LeafPosition(this, -1), false));
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -48,7 +48,7 @@ import org.apache.fop.traits.MinOptMax;
* an exception to this rule.)
* This class can be extended to handle the creation and adding of the
* inline area.
- * @asf.todo [GA] replace use of hungarian notation with normalized java naming
+ * TODO [GA] replace use of hungarian notation with normalized java naming
*/
public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
implements InlineLevelLayoutManager {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -132,10 +132,10 @@ public class LineLayoutManager extends I
private int spaceAfter;
private int baseline;
- LineBreakPosition // CSOK: ParameterNumber
- (LayoutManager lm, int index, int startIndex, int breakIndex,
- int shrink, int stretch, int diff, double ipdA, double adjust, int ind,
- int lh, int lw, int sb, int sa, int bl) {
+ LineBreakPosition( // CSOK: ParameterNumber
+ LayoutManager lm, int index, int startIndex, int breakIndex,
+ int shrink, int stretch, int diff, double ipdA, double adjust, int ind,
+ int lh, int lw, int sb, int sa, int bl) {
super(lm, breakIndex);
availableShrink = shrink;
availableStretch = stretch;
@@ -196,20 +196,14 @@ public class LineLayoutManager extends I
* which was the first element in the paragraph
* returned by each LM.
*/
- private class Update {
- private InlineLevelLayoutManager inlineLM;
- private int firstIndex;
+ private final class Update {
+ private final InlineLevelLayoutManager inlineLM;
+ private final int firstIndex;
- public Update(InlineLevelLayoutManager lm, int index) {
+ private Update(InlineLevelLayoutManager lm, int index) {
inlineLM = lm;
firstIndex = index;
}
- InlineLevelLayoutManager getInlineLM() {
- return inlineLM;
- }
- int getFirstIndex() {
- return firstIndex;
- }
}
// this class represents a paragraph
@@ -331,9 +325,9 @@ public class LineLayoutManager extends I
private int follow;
private static final double MAX_DEMERITS = 10e6;
- public LineBreakingAlgorithm // CSOK: ParameterNumber
- (int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
- int lh, int ld, int fl, boolean first, int maxFlagCount, LineLayoutManager llm) {
+ public LineBreakingAlgorithm( // CSOK: ParameterNumber
+ int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
+ int lh, int ld, int fl, boolean first, int maxFlagCount, LineLayoutManager llm) {
super(textAlign, textAlignLast, first, false, maxFlagCount);
pageAlignment = pageAlign;
textIndent = indent;
@@ -362,7 +356,7 @@ public class LineLayoutManager extends I
indent += (textAlign == Constants.EN_CENTER)
? difference / 2 : (textAlign == Constants.EN_END) ? difference : 0;
indent += (bestActiveNode.line == 1 && indentFirstPart && isFirstInBlock)
- ? textIndent : 0;
+ ? textIndent : 0;
double ratio = (textAlign == Constants.EN_JUSTIFY
|| difference < 0 && -difference <= bestActiveNode.availableShrink)
? bestActiveNode.adjustRatio : 0;
@@ -410,9 +404,9 @@ public class LineLayoutManager extends I
activePossibility = -1;
}
- private LineBreakPosition makeLineBreakPosition // CSOK: ParameterNumber
- (KnuthSequence par, int firstElementIndex, int lastElementIndex, int availableShrink,
- int availableStretch, int difference, double ratio, int indent) {
+ private LineBreakPosition makeLineBreakPosition( // CSOK: ParameterNumber
+ KnuthSequence par, int firstElementIndex, int lastElementIndex, int availableShrink,
+ int availableStretch, int difference, double ratio, int indent) {
// line height calculation - spaceBefore may differ from spaceAfter
// by 1mpt due to rounding
int spaceBefore = (lineHeight - lead - follow) / 2;
@@ -717,7 +711,8 @@ public class LineLayoutManager extends I
// finish last paragraph if it was closed with a linefeed
if (lastElement.isPenalty()
- && ((KnuthPenalty) lastElement).getPenalty() == -KnuthPenalty.INFINITE) {
+ && ((KnuthPenalty) lastElement).getPenalty()
+ == -KnuthPenalty.INFINITE) {
// a penalty item whose value is -inf
// represents a preserved linefeed,
// which forces a line break
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -37,7 +37,7 @@ public class PageNumberCitationLastLayou
* Constructor
*
* @param node the formatting object that creates this area
- * @asf.todo better retrieval of font info
+ * TODO better retrieval of font info
*/
public PageNumberCitationLastLayoutManager(PageNumberCitationLast node) {
super(node);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -35,7 +35,7 @@ public class PageNumberCitationLayoutMan
* Constructor
*
* @param node the formatting object that creates this area
- * @asf.todo better retrieval of font info
+ * TODO better retrieval of font info
*/
public PageNumberCitationLayoutManager(PageNumberCitation node) {
super(node);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -81,10 +81,10 @@ public class TextLayoutManager extends L
private boolean breakOppAfter;
private final Font font;
- AreaInfo // CSOK: ParameterNumber
- (int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
- MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
- Font font) {
+ AreaInfo( // CSOK: ParameterNumber
+ int startIndex, int breakIndex, int wordSpaceCount, int letterSpaceCount,
+ MinOptMax areaIPD, boolean isHyphenated, boolean isSpace, boolean breakOppAfter,
+ Font font) {
assert startIndex <= breakIndex;
this.startIndex = startIndex;
this.breakIndex = breakIndex;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CellPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CellPart.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CellPart.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/CellPart.java Fri Aug 27 15:26:26 2010
@@ -61,8 +61,8 @@ class CellPart {
* @param bpAfterLast width of (possibly optional) border- and padding-after if this
* part will be the last one on the page
*/
- protected CellPart // CSOK: ParameterNumber
- (PrimaryGridUnit pgu, int start, int end, boolean last,
+ protected CellPart( // CSOK: ParameterNumber
+ PrimaryGridUnit pgu, int start, int end, boolean last,
int condBeforeContentLength, int length, int condAfterContentLength,
int bpBeforeNormal, int bpBeforeFirst,
int bpAfterNormal, int bpAfterLast) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -33,7 +33,7 @@ import org.apache.fop.layoutmgr.Position
* The caption contains blocks that are positioned next to the
* table on the caption side.
* The caption blocks have an implicit keep with the table.
- * @asf.todo Implement getNextKnuthElements()
+ * TODO Implement getNextKnuthElements()
*/
public class TableAndCaptionLayoutManager extends BlockStackingLayoutManager {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -31,7 +31,7 @@ import org.apache.fop.layoutmgr.Position
* LayoutManager for a table-caption FO.
* The table caption contains blocks that are placed beside the
* table.
- * @asf.todo Implement getNextKnuthElements()
+ * TODO Implement getNextKnuthElements()
*/
public class TableCaptionLayoutManager extends BlockStackingLayoutManager {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Fri Aug 27 15:26:26 2010
@@ -277,10 +277,10 @@ public class TableCellLayoutManager exte
* this row is placed on a previous page). Used to calculate the placement of the
* row's background image if any
*/
- public void addAreas // CSOK: ParameterNumber
- (PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
- int startRow, int endRow, int borderBeforeWhich, int borderAfterWhich, boolean firstOnPage,
- boolean lastOnPage, RowPainter painter, int firstRowHeight) {
+ public void addAreas( // CSOK: ParameterNumber
+ PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
+ int startRow, int endRow, int borderBeforeWhich, int borderAfterWhich,
+ boolean firstOnPage, boolean lastOnPage, RowPainter painter, int firstRowHeight) {
getParentArea(null);
addId();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFCIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFCIDFont.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFCIDFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFCIDFont.java Fri Aug 27 15:26:26 2010
@@ -56,10 +56,10 @@ public class PDFCIDFont extends PDFObjec
* @param supplement Supplement number
* @param descriptor CID font descriptor
*/
- public PDFCIDFont // CSOK: ParameterNumber
- (String basefont, CIDFontType cidtype, int dw,
- int[] w, String registry, String ordering,
- int supplement, PDFCIDFontDescriptor descriptor) {
+ public PDFCIDFont( // CSOK: ParameterNumber
+ String basefont, CIDFontType cidtype, int dw,
+ int[] w, String registry, String ordering,
+ int supplement, PDFCIDFontDescriptor descriptor) {
this(basefont, cidtype, dw,
new PDFWArray(w),
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java Fri Aug 27 15:26:26 2010
@@ -292,13 +292,13 @@ public class PDFFactory {
* It should be 0 as this is the constructor for sampled functions.
* @return the PDF function that was created
*/
- public PDFFunction makeFunction // CSOK: ParameterNumber
- (int theFunctionType, List theDomain,
- List theRange, List theSize,
- int theBitsPerSample, int theOrder,
- List theEncode, List theDecode,
- StringBuffer theFunctionDataStream,
- List theFilter) {
+ public PDFFunction makeFunction( // CSOK: ParameterNumber
+ int theFunctionType, List theDomain,
+ List theRange, List theSize,
+ int theBitsPerSample, int theOrder,
+ List theEncode, List theDecode,
+ StringBuffer theFunctionDataStream,
+ List theFilter) {
// Type 0 function
PDFFunction function = new PDFFunction(theFunctionType, theDomain,
theRange, theSize,
@@ -466,13 +466,13 @@ public class PDFFactory {
* @param theFunction The PDF Function that maps an (x,y) location to a color
* @return the PDF shading that was created
*/
- public PDFShading makeShading // CSOK: ParameterNumber
- (PDFResourceContext res, int theShadingType,
- PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, List theDomain,
- List theMatrix,
- PDFFunction theFunction) {
+ public PDFShading makeShading( // CSOK: ParameterNumber
+ PDFResourceContext res, int theShadingType,
+ PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, List theDomain,
+ List theMatrix,
+ PDFFunction theFunction) {
// make Shading of Type 1
PDFShading shading = new PDFShading(theShadingType,
theColorSpace, theBackground,
@@ -519,13 +519,13 @@ public class PDFFactory {
* The default is [false, false]
* @return the PDF shading that was created
*/
- public PDFShading makeShading // CSOK: ParameterNumber
- (PDFResourceContext res, int theShadingType,
- PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, List theCoords,
- List theDomain, PDFFunction theFunction,
- List theExtend) {
+ public PDFShading makeShading( // CSOK: ParameterNumber
+ PDFResourceContext res, int theShadingType,
+ PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, List theCoords,
+ List theDomain, PDFFunction theFunction,
+ List theExtend) {
// make Shading of Type 2 or 3
PDFShading shading = new PDFShading(theShadingType,
theColorSpace, theBackground,
@@ -573,15 +573,15 @@ public class PDFFactory {
* @param theFunction the PDFFunction
* @return the PDF shading that was created
*/
- public PDFShading makeShading // CSOK: ParameterNumber
- (PDFResourceContext res, int theShadingType,
- PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias,
- int theBitsPerCoordinate,
- int theBitsPerComponent,
- int theBitsPerFlag, List theDecode,
- PDFFunction theFunction) {
+ public PDFShading makeShading( // CSOK: ParameterNumber
+ PDFResourceContext res, int theShadingType,
+ PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias,
+ int theBitsPerCoordinate,
+ int theBitsPerComponent,
+ int theBitsPerFlag, List theDecode,
+ PDFFunction theFunction) {
// make Shading of type 4,6 or 7
PDFShading shading = new PDFShading(theShadingType,
theColorSpace, theBackground,
@@ -629,15 +629,15 @@ public class PDFFactory {
* @param theFunction The PDFFunction that's mapped on to this shape
* @return the PDF shading that was created
*/
- public PDFShading makeShading // CSOK: ParameterNumber
- (PDFResourceContext res, int theShadingType,
- PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias,
- int theBitsPerCoordinate,
- int theBitsPerComponent, List theDecode,
- int theVerticesPerRow,
- PDFFunction theFunction) {
+ public PDFShading makeShading( // CSOK: ParameterNumber
+ PDFResourceContext res, int theShadingType,
+ PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias,
+ int theBitsPerCoordinate,
+ int theBitsPerComponent, List theDecode,
+ int theVerticesPerRow,
+ PDFFunction theFunction) {
// make shading of Type 5
PDFShading shading = new PDFShading(theShadingType,
theColorSpace, theBackground,
@@ -680,12 +680,12 @@ public class PDFFactory {
* @param thePatternDataStream The stream of pattern data to be tiled.
* @return the PDF pattern that was created
*/
- public PDFPattern makePattern // CSOK: ParameterNumber
- (PDFResourceContext res, int thePatternType, // 1
- PDFResources theResources, int thePaintType, int theTilingType,
- List theBBox, double theXStep,
- double theYStep, List theMatrix,
- List theXUID, StringBuffer thePatternDataStream) {
+ public PDFPattern makePattern( // CSOK: ParameterNumber
+ PDFResourceContext res, int thePatternType, // 1
+ PDFResources theResources, int thePaintType, int theTilingType,
+ List theBBox, double theXStep,
+ double theYStep, List theMatrix,
+ List theXUID, StringBuffer thePatternDataStream) {
// PDFResources theResources
PDFPattern pattern = new PDFPattern(theResources, 1,
thePaintType, theTilingType,
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFontDescriptor.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFontDescriptor.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFontDescriptor.java Fri Aug 27 15:26:26 2010
@@ -40,11 +40,11 @@ public class PDFFontDescriptor extends P
* @param italicAngle the angle of the vertical dominant strokes
* @param stemV the width of the dominant vertical stems of glyphs
*/
- public PDFFontDescriptor // CSOK: ParameterNumber
- (String basefont, int ascent,
- int descent, int capHeight, int flags,
- PDFRectangle fontBBox, int italicAngle,
- int stemV) {
+ public PDFFontDescriptor( // CSOK: ParameterNumber
+ String basefont, int ascent,
+ int descent, int capHeight, int flags,
+ PDFRectangle fontBBox, int italicAngle,
+ int stemV) {
super();
put("Type", new PDFName("FontDescriptor"));
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFunction.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFunction.java Fri Aug 27 15:26:26 2010
@@ -211,11 +211,11 @@ public class PDFFunction extends PDFObje
* @param theFunctionType This is the type of function (0,2,3, or 4).
* It should be 0 as this is the constructor for sampled functions.
*/
- public PDFFunction // CSOK: ParameterNumber
- (int theFunctionType, List theDomain,
- List theRange, List theSize, int theBitsPerSample,
- int theOrder, List theEncode, List theDecode,
- StringBuffer theFunctionDataStream, List theFilter) {
+ public PDFFunction( // CSOK: ParameterNumber
+ int theFunctionType, List theDomain,
+ List theRange, List theSize, int theBitsPerSample,
+ int theOrder, List theEncode, List theDecode,
+ StringBuffer theFunctionDataStream, List theFilter) {
super();
this.functionType = 0; // dang well better be 0;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFPattern.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFPattern.java Fri Aug 27 15:26:26 2010
@@ -117,12 +117,12 @@ public class PDFPattern extends PDFPathP
* @param theXUID Optional vector of Integers that uniquely identify the pattern
* @param thePatternDataStream The stream of pattern data to be tiled.
*/
- public PDFPattern // CSOK: ParameterNumber
- (PDFResources theResources, int thePatternType, // 1
- int thePaintType, int theTilingType, List theBBox,
- double theXStep, double theYStep,
- List theMatrix, List theXUID,
- StringBuffer thePatternDataStream) {
+ public PDFPattern( // CSOK: ParameterNumber
+ PDFResources theResources, int thePatternType, // 1
+ int thePaintType, int theTilingType, List theBBox,
+ double theXStep, double theYStep,
+ List theMatrix, List theXUID,
+ StringBuffer thePatternDataStream) {
super();
this.resources = theResources;
// This next parameter is implicit to all constructors, and is
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFShading.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFShading.java Fri Aug 27 15:26:26 2010
@@ -164,11 +164,11 @@ public class PDFShading extends PDFObjec
* It's optional, the default is the identity matrix
* @param theFunction The PDF Function that maps an (x,y) location to a color
*/
- public PDFShading // CSOK: ParameterNumber
- (int theShadingType, PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, List theDomain,
- List theMatrix, PDFFunction theFunction) {
+ public PDFShading( // CSOK: ParameterNumber
+ int theShadingType, PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, List theDomain,
+ List theMatrix, PDFFunction theFunction) {
super();
this.shadingType = theShadingType; // 1
this.colorSpace = theColorSpace;
@@ -203,12 +203,12 @@ public class PDFShading extends PDFObjec
* and end colors past the start and end points
* The default is [false, false]
*/
- public PDFShading // CSOK: ParameterNumber
- (int theShadingType, PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, List theCoords,
- List theDomain, PDFFunction theFunction,
- List theExtend) {
+ public PDFShading( // CSOK: ParameterNumber
+ int theShadingType, PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, List theCoords,
+ List theDomain, PDFFunction theFunction,
+ List theExtend) {
super();
this.shadingType = theShadingType; // 2 or 3
this.colorSpace = theColorSpace;
@@ -244,12 +244,12 @@ public class PDFShading extends PDFObjec
* @param theDecode List of Doubles see PDF 1.3 spec pages 303 to 312.
* @param theFunction the PDFFunction
*/
- public PDFShading // CSOK: ParameterNumber
- (int theShadingType, PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, int theBitsPerCoordinate,
- int theBitsPerComponent, int theBitsPerFlag,
- List theDecode, PDFFunction theFunction) {
+ public PDFShading( // CSOK: ParameterNumber
+ int theShadingType, PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, int theBitsPerCoordinate,
+ int theBitsPerComponent, int theBitsPerFlag,
+ List theDecode, PDFFunction theFunction) {
super();
this.shadingType = theShadingType; // 4,6 or 7
@@ -284,12 +284,12 @@ public class PDFShading extends PDFObjec
* @param theVerticesPerRow number of vertices in each "row" of the lattice.
* @param theFunction The PDFFunction that's mapped on to this shape
*/
- public PDFShading // CSOK: ParameterNumber
- (int theShadingType, PDFDeviceColorSpace theColorSpace,
- List theBackground, List theBBox,
- boolean theAntiAlias, int theBitsPerCoordinate,
- int theBitsPerComponent, List theDecode,
- int theVerticesPerRow, PDFFunction theFunction) {
+ public PDFShading( // CSOK: ParameterNumber
+ int theShadingType, PDFDeviceColorSpace theColorSpace,
+ List theBackground, List theBBox,
+ boolean theAntiAlias, int theBitsPerCoordinate,
+ int theBitsPerComponent, List theDecode,
+ int theVerticesPerRow, PDFFunction theFunction) {
super();
this.shadingType = theShadingType; // 5
this.colorSpace = theColorSpace;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Fri Aug 27 15:26:26 2010
@@ -172,10 +172,10 @@ public abstract class AbstractPathOrient
* @param bpsStart the border-start traits
* @param bpsEnd the border-end traits
*/
- protected void drawBackground // CSOK: ParameterNumber
- (float startx, float starty, float width, float height, Trait.Background back,
- BorderProps bpsBefore, BorderProps bpsAfter,
- BorderProps bpsStart, BorderProps bpsEnd) {
+ protected void drawBackground( // CSOK: ParameterNumber
+ float startx, float starty, float width, float height, Trait.Background back,
+ BorderProps bpsBefore, BorderProps bpsAfter,
+ BorderProps bpsStart, BorderProps bpsEnd) {
if (back != null) {
endTextObject();
@@ -261,10 +261,10 @@ public abstract class AbstractPathOrient
* @param bpsStart the border-start traits
* @param bpsEnd the border-end traits
*/
- protected void drawBorders // CSOK: ParameterNumber
- (float startx, float starty, float width, float height,
- BorderProps bpsBefore, BorderProps bpsAfter,
- BorderProps bpsStart, BorderProps bpsEnd) {
+ protected void drawBorders( // CSOK: ParameterNumber
+ float startx, float starty, float width, float height,
+ BorderProps bpsBefore, BorderProps bpsAfter,
+ BorderProps bpsStart, BorderProps bpsEnd) {
Rectangle2D.Float borderRect = new Rectangle2D.Float(startx, starty, width, height);
drawBorders(borderRect, bpsBefore, bpsAfter, bpsStart, bpsEnd);
}
@@ -282,8 +282,8 @@ public abstract class AbstractPathOrient
* @param bpsStart the border specification on the start side
* @param bpsEnd the border specification on the end side
*/
- protected void drawBorders // CSOK: MethodLength
- (Rectangle2D.Float borderRect,
+ protected void drawBorders( // CSOK: MethodLength
+ Rectangle2D.Float borderRect,
BorderProps bpsBefore, BorderProps bpsAfter, BorderProps bpsStart, BorderProps bpsEnd) {
//TODO generalize each of the four conditions into using a parameterized drawBorder()
boolean[] border = new boolean[] {
@@ -858,9 +858,9 @@ public abstract class AbstractPathOrient
* @param style the border style (one of Constants.EN_DASHED etc.)
* @param col the color for the border segment
*/
- protected abstract void drawBorderLine // CSOK: ParameterNumber
- (float x1, float y1, float x2, float y2, boolean horz,
- boolean startOrBefore, int style, Color col);
+ protected abstract void drawBorderLine( // CSOK: ParameterNumber
+ float x1, float y1, float x2, float y2, boolean horz,
+ boolean startOrBefore, int style, Color col);
/** {@inheritDoc} */
public void renderForeignObject(ForeignObject fo, Rectangle2D pos) {
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=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -281,8 +281,8 @@ public class AFPPainter extends Abstract
return mpt / 1000f;
}
- protected void drawBorderLine // CSOK: ParameterNumber
- (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),
@@ -317,9 +317,9 @@ public class AFPPainter extends Abstract
}
/** {@inheritDoc} */
- public void drawText // CSOK: MethodLength
- (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/intermediate/BorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/BorderPainter.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -217,9 +217,9 @@ public abstract class BorderPainter {
* @param color the border color
* @throws IOException if an I/O error occurs
*/
- protected abstract void drawBorderLine // CSOK: ParameterNumber
- (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/IFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -1238,8 +1238,8 @@ public class IFRenderer extends Abstract
}
/** {@inheritDoc} */
- protected void drawBorders // CSOK: ParameterNumber
- (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) {
@@ -1252,8 +1252,8 @@ public class IFRenderer extends Abstract
}
/** {@inheritDoc} */
- protected void drawBorderLine // CSOK: ParameterNumber
- (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/java2d/Java2DBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -64,8 +64,8 @@ public class Java2DBorderPainter extends
}
/** {@inheritDoc} */
- protected void drawBorderLine // CSOK: ParameterNumber
- (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/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -536,8 +536,8 @@ public abstract class Java2DRenderer ext
}
/** {@inheritDoc} */
- protected void drawBorderLine // CSOK: ParameterNumber
- (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/pcl/PCLPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pcl/PCLPainter.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -390,11 +390,11 @@ public class PCLPainter extends Abstract
private static final double SAFETY_MARGIN_FACTOR = 0.05;
- private Rectangle getTextBoundingBox // CSOK: ParameterNumber
- (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/pdf/PDFBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java?rev=990174&r1=990173&r2=990174&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 Fri Aug 27 15:26:26 2010
@@ -50,9 +50,9 @@ public class PDFBorderPainter extends Bo
}
/** {@inheritDoc} */
- protected void drawBorderLine // CSOK: ParameterNumber
- (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);
}
@@ -61,10 +61,10 @@ public class PDFBorderPainter extends Bo
* @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
+ 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;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSBorderPainter.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSBorderPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSBorderPainter.java Fri Aug 27 15:26:26 2010
@@ -52,9 +52,9 @@ public class PSBorderPainter extends Bor
}
/** {@inheritDoc} */
- protected void drawBorderLine // CSOK: ParameterNumber
- (int x1, int y1, int x2, int y2, boolean horz,
- boolean startOrBefore, int style, Color col) throws IOException {
+ protected void drawBorderLine( // CSOK: ParameterNumber
+ int x1, int y1, int x2, int y2, boolean horz,
+ boolean startOrBefore, int style, Color col) throws IOException {
drawBorderLine(generator, toPoints(x1), toPoints(y1), toPoints(x2), toPoints(y2),
horz, startOrBefore, style, col);
}
@@ -71,11 +71,11 @@ public class PSBorderPainter extends Bor
* @param gen ps content generator
* @see BorderPainter#drawBorderLine
*/
- public static void drawBorderLine // CSOK: ParameterNumber
- (PSGenerator gen,
- float x1, float y1, float x2, float y2, boolean horz, // CSOK: JavadocMethod
- boolean startOrBefore, int style, Color col) // CSOK: JavadocMethod
- throws IOException { // CSOK: JavadocMethod
+ public static void drawBorderLine( // CSOK: ParameterNumber
+ PSGenerator gen,
+ float x1, float y1, float x2, float y2, boolean horz, // CSOK: JavadocMethod
+ boolean startOrBefore, int style, Color col) // CSOK: JavadocMethod
+ throws IOException { // CSOK: JavadocMethod
float w = x2 - x1;
float h = y2 - y1;
if ((w < 0) || (h < 0)) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/PSPainter.java Fri Aug 27 15:26:26 2010
@@ -403,10 +403,10 @@ public class PSPainter extends AbstractI
}
}
- private void writeText // CSOK: ParameterNumber
- (String text, int start, int len,
- int letterSpacing, int wordSpacing, int[] dx,
- Font font, Typeface tf, boolean multiByte) throws IOException {
+ private void writeText( // CSOK: ParameterNumber
+ String text, int start, int len,
+ int letterSpacing, int wordSpacing, int[] dx,
+ Font font, Typeface tf, boolean multiByte) throws IOException {
PSGenerator generator = getGenerator();
int end = start + len;
int initialSize = len;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java Fri Aug 27 15:26:26 2010
@@ -494,9 +494,9 @@ public class TXTRenderer extends Abstrac
/**
* {@inheritDoc}
*/
- protected void drawBorderLine // CSOK: ParameterNumber
- (float x1, float y1, float x2, float y2,
- boolean horz, boolean startOrBefore, int style, Color col) {
+ protected void drawBorderLine( // CSOK: ParameterNumber
+ float x1, float y1, float x2, float y2,
+ boolean horz, boolean startOrBefore, int style, Color col) {
int borderHeight = bm.getHeight();
int borderWidth = bm.getWidth();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java?rev=990174&r1=990173&r2=990174&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java Fri Aug 27 15:26:26 2010
@@ -118,10 +118,10 @@ public final class ColorExt extends Colo
* ICC color values
* @return the requested color object
*/
- public static ColorExt createFromSvgIccColor // CSOK: ParameterNumber
- (float red, float green,
- float blue, float opacity, String profileName, String profileHref,
- ColorSpace profileCS, float[] colorValues) {
+ public static ColorExt createFromSvgIccColor( // CSOK: ParameterNumber
+ float red, float green,
+ float blue, float opacity, String profileName, String profileHref,
+ ColorSpace profileCS, float[] colorValues) {
//TODO this method is not referenced by FOP, can it be deleted?
ColorExt ce = new ColorExt(red, green, blue, opacity);
ce.rgbReplacementRed = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org