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 2013/05/07 20:53:30 UTC
svn commit: r1480018 [2/2] - in /xmlgraphics/fop/trunk: ./
src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/complexscripts/bidi/
sr...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Tue May 7 18:53:29 2013
@@ -117,7 +117,7 @@ class PageBreakingAlgorithm extends Brea
* @param favorSinglePart true if favoring single part
* @see BreakingAlgorithm
*/
- public PageBreakingAlgorithm(LayoutManager topLevelLM, // CSOK: ParameterNumber
+ public PageBreakingAlgorithm(LayoutManager topLevelLM,
PageProvider pageProvider,
PageBreakingLayoutListener layoutListener,
int alignment, int alignmentLast,
@@ -141,15 +141,15 @@ class PageBreakingAlgorithm extends Brea
protected class KnuthPageNode extends KnuthNode {
/** Additional length due to footnotes. */
- public int totalFootnotes; // CSOK: VisibilityModifier
+ public int totalFootnotes;
/** Index of the last inserted footnote. */
- public int footnoteListIndex; // CSOK: VisibilityModifier
+ public int footnoteListIndex;
/** Index of the last inserted element of the last inserted footnote. */
- public int footnoteElementIndex; // CSOK: VisibilityModifier
+ public int footnoteElementIndex;
- public KnuthPageNode(int position, // CSOK: ParameterNumber
+ public KnuthPageNode(int position,
int line, int fitness,
int totalWidth, int totalStretch, int totalShrink,
int totalFootnotes, int footnoteListIndex, int footnoteElementIndex,
@@ -280,7 +280,7 @@ class PageBreakingAlgorithm extends Brea
/** {@inheritDoc} */
@Override
- protected KnuthNode createNode(int position, // CSOK: ParameterNumber
+ protected KnuthNode createNode(int position,
int line, int fitness,
int totalWidth, int totalStretch, int totalShrink,
double adjustRatio, int availableShrink, int availableStretch,
@@ -515,10 +515,10 @@ class PageBreakingAlgorithm extends Brea
footnoteListIndex = footnotesList.size() - 1;
footnoteElementIndex
= getFootnoteList(footnoteListIndex).size() - 1;
- } else if (((canDeferOldFN = canDeferOldFootnotes(// CSOK: InnerAssignment
+ } else if (((canDeferOldFN = canDeferOldFootnotes(
pageNode, elementIndex))
|| newFootnotes)
- && (footnoteSplit = getFootnoteSplit(// CSOK: InnerAssignment
+ && (footnoteSplit = getFootnoteSplit(
pageNode, getLineWidth(activeNode.line) - actualWidth,
canDeferOldFN)) > 0) {
// it is allowed to break or even defer footnotes if either:
@@ -890,7 +890,7 @@ class PageBreakingAlgorithm extends Brea
insertedFootnotesLength = totalFootnotesLength;
footnoteListIndex = lengthList.size() - 1;
footnoteElementIndex = getFootnoteList(footnoteListIndex).size() - 1;
- } else if ((split = getFootnoteSplit(// CSOK: InnerAssignment
+ } else if ((split = getFootnoteSplit(
footnoteListIndex, footnoteElementIndex,
insertedFootnotesLength, availableBPD, true)) > 0) {
// add a piece of a footnote
@@ -1145,7 +1145,7 @@ class PageBreakingAlgorithm extends Brea
@Override
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) {
log.trace("IPD changes at page " + line);
if (bestNodeForIPDChange == null
|| node.totalDemerits < bestNodeForIPDChange.totalDemerits) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java Tue May 7 18:53:29 2013
@@ -111,7 +111,7 @@ public class AlignmentContext implements
* @param dominantBaseline the dominant-baseline property
* @param parentAlignmentContext the parent alignment context
*/
- private AlignmentContext(int altitude, // CSOK: ParameterNumber
+ private AlignmentContext(int altitude,
int depth,
int lineHeight,
int xHeight,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Tue May 7 18:53:29 2013
@@ -256,7 +256,7 @@ public class InlineLayoutManager extends
}
/** {@inheritDoc} */
- @Override // CSOK: MethodLength
+ @Override
public List getNextKnuthElements(
LayoutContext context, int alignment) {
LayoutManager curLM;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java Tue May 7 18:53:29 2013
@@ -165,13 +165,13 @@ public final class PDFEncryptionJCE exte
private static final class EncryptionSettings {
- final int encryptionLength; // CSOK: VisibilityModifier
+ final int encryptionLength;
- final int permissions; // CSOK: VisibilityModifier
+ final int permissions;
- final String userPassword; // CSOK: VisibilityModifier
+ final String userPassword;
- final String ownerPassword; // CSOK: VisibilityModifier
+ final String ownerPassword;
EncryptionSettings(int encryptionLength, int permissions,
String userPassword, String ownerPassword) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Tue May 7 18:53:29 2013
@@ -1061,12 +1061,12 @@ public class PDFFactory {
} else if (targetLo.endsWith(".pdf")) {
// Bare PDF file name?
return getGoToPDFAction(target, null, -1, newWindow);
- } else if ((index = targetLo.indexOf(".pdf#page=")) > 0) { // CSOK: InnerAssignment
+ } else if ((index = targetLo.indexOf(".pdf#page=")) > 0) {
// PDF file + page?
String filename = target.substring(0, index + 4);
int page = Integer.parseInt(target.substring(index + 10));
return getGoToPDFAction(filename, null, page, newWindow);
- } else if ((index = targetLo.indexOf(".pdf#dest=")) > 0) { // CSOK: InnerAssignment
+ } else if ((index = targetLo.indexOf(".pdf#dest=")) > 0) {
// PDF file + destination?
String filename = target.substring(0, index + 4);
String dest = target.substring(index + 10);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java Tue May 7 18:53:29 2013
@@ -374,7 +374,7 @@ public class PDFFunction extends PDFObje
*
* @return the PDF string.
*/
- public byte[] toPDF() { // CSOK: MethodLength
+ public byte[] toPDF() {
int vectorSize = 0;
int numberOfFunctions = 0;
int tempInt = 0;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java Tue May 7 18:53:29 2013
@@ -334,7 +334,7 @@ public class PDFShading extends PDFObjec
*
* @return the PDF string.
*/
- public String toPDFString() { // CSOK: MethodLength
+ public String toPDFString() {
int vectorSize;
int tempInt;
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java Tue May 7 18:53:29 2013
@@ -62,7 +62,7 @@ public class AWTRenderer extends Java2DR
public static final String MIME_TYPE = MimeConstants.MIME_FOP_AWT_PREVIEW;
/** flag for debugging */
- public boolean debug; // CSOK: VisibilityModifier
+ public boolean debug;
/**
* Will be notified when rendering progresses
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java Tue May 7 18:53:29 2013
@@ -77,7 +77,7 @@ public class BorderPainter {
* @param innerBackgroundColor the inner background color
* @throws IFException if an error occurs while drawing the borders
*/
- public void drawBorders(Rectangle borderRect, // CSOK: MethodLength
+ public void drawBorders(Rectangle borderRect,
BorderProps bpsTop, BorderProps bpsBottom,
BorderProps bpsLeft, BorderProps bpsRight, Color innerBackgroundColor)
throws IFException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java Tue May 7 18:53:29 2013
@@ -82,17 +82,17 @@ public class Java2DSVGHandler extends Ab
*/
public static class Java2DInfo {
/** see Java2D_STATE */
- public Java2DGraphicsState state; // CSOK: VisibilityModifier
+ public Java2DGraphicsState state;
/** see Java2D_WIDTH */
- public int width; // CSOK: VisibilityModifier
+ public int width;
/** see Java2D_HEIGHT */
- public int height; // CSOK: VisibilityModifier
+ public int height;
/** see Java2D_XPOS */
- public int currentXPosition; // CSOK: VisibilityModifier
+ public int currentXPosition;
/** see Java2D_YPOS */
- public int currentYPosition; // CSOK: VisibilityModifier
+ public int currentYPosition;
/** paint as bitmap */
- public boolean paintAsBitmap; // CSOK: VisibilityModifier
+ public boolean paintAsBitmap;
/** {@inheritDoc} */
public String toString() {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java Tue May 7 18:53:29 2013
@@ -62,7 +62,7 @@ public class PDFImageHandlerSVG implemen
private static Log log = LogFactory.getLog(PDFImageHandlerSVG.class);
/** {@inheritDoc} */
- public void handleImage(RenderingContext context, // CSOK: MethodLength
+ public void handleImage(RenderingContext context,
Image image, Rectangle pos)
throws IOException {
PDFRenderingContext pdfContext = (PDFRenderingContext)context;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java Tue May 7 18:53:29 2013
@@ -67,12 +67,12 @@ class PDFLogicalStructureHandler {
* operator. This is the structure type of the corresponding structure
* element.
*/
- final String tag; // CSOK: VisibilityModifier
+ final String tag;
/**
* The value for the MCID entry of the marked-content sequence's property list.
*/
- final int mcid; // CSOK: VisibilityModifier
+ final int mcid;
private final PDFStructElem parent;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java Tue May 7 18:53:29 2013
@@ -80,33 +80,33 @@ public class PDFSVGHandler extends Abstr
*/
public static class PDFInfo {
/** see PDF_DOCUMENT */
- public PDFDocument pdfDoc; // CSOK: VisibilityModifier
+ public PDFDocument pdfDoc;
/** see OUTPUT_STREAM */
- public OutputStream outputStream; // CSOK: VisibilityModifier
+ public OutputStream outputStream;
/** see PDF_PAGE */
- public PDFPage pdfPage; // CSOK: VisibilityModifier
+ public PDFPage pdfPage;
/** see PDF_CONTEXT */
- public PDFResourceContext pdfContext; // CSOK: VisibilityModifier
+ public PDFResourceContext pdfContext;
/** see PDF_STREAM */
//public PDFStream currentStream;
/** see PDF_WIDTH */
- public int width; // CSOK: VisibilityModifier
+ public int width;
/** see PDF_HEIGHT */
- public int height; // CSOK: VisibilityModifier
+ public int height;
/** see PDF_FONT_INFO */
- public FontInfo fi; // CSOK: VisibilityModifier
+ public FontInfo fi;
/** see PDF_FONT_NAME */
- public String currentFontName; // CSOK: VisibilityModifier
+ public String currentFontName;
/** see PDF_FONT_SIZE */
- public int currentFontSize; // CSOK: VisibilityModifier
+ public int currentFontSize;
/** see PDF_XPOS */
- public int currentXPosition; // CSOK: VisibilityModifier
+ public int currentXPosition;
/** see PDF_YPOS */
- public int currentYPosition; // CSOK: VisibilityModifier
+ public int currentYPosition;
/** see PDF_HANDLER_CONFIGURATION */
- public Configuration cfg; // CSOK: VisibilityModifier
+ public Configuration cfg;
/** true if SVG should be rendered as a bitmap instead of natively */
- public boolean paintAsBitmap; // CSOK: VisibilityModifier
+ public boolean paintAsBitmap;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java Tue May 7 18:53:29 2013
@@ -1518,7 +1518,7 @@ public class RTFHandler extends FOEventH
* @param foNode FO node whose event is to be called
* @param bStart TRUE calls the start handler, FALSE the end handler
*/
- private void invokeDeferredEvent(FONode foNode, boolean bStart) { // CSOK: MethodLength
+ private void invokeDeferredEvent(FONode foNode, boolean bStart) {
if (foNode instanceof PageSequence) {
if (bStart) {
startPageSequence((PageSequence) foNode);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java Tue May 7 18:53:29 2013
@@ -30,10 +30,10 @@ import java.io.Writer;
*/
public class RtfFootnote extends RtfContainer
implements IRtfTextrunContainer, IRtfListContainer {
- RtfTextrun textrunInline = null; // CSOK: VisibilityModifier
- RtfContainer body = null; // CSOK: VisibilityModifier
- RtfList list = null; // CSOK: VisibilityModifier
- boolean bBody = false; // CSOK: VisibilityModifier
+ RtfTextrun textrunInline = null;
+ RtfContainer body = null;
+ RtfList list = null;
+ boolean bBody = false;
/**
* Create an RTF list item as a child of given container with default attributes.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java Tue May 7 18:53:29 2013
@@ -778,7 +778,7 @@ public class PDFGraphics2D extends Abstr
* @param fill true if the paint should be set for filling
* @return true if the paint is handled natively, false if the paint should be rasterized
*/
- protected boolean applyPaint(Paint paint, boolean fill) { // CSOK: MethodLength
+ protected boolean applyPaint(Paint paint, boolean fill) {
preparePainting();
if (paint instanceof Color) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java Tue May 7 18:53:29 2013
@@ -58,19 +58,19 @@ public class BorderProps implements Seri
}
/** Border style (one of EN_*) */
- public final int style; // Enum for border style // CSOK: VisibilityModifier
+ public final int style; // Enum for border style
/** Border color */
- public final Color color; // CSOK: VisibilityModifier
+ public final Color color;
/** Border width */
- public final int width; // CSOK: VisibilityModifier
+ public final int width;
private final int radiusStart;
private final int radiusEnd;
/** Border mode */
- private final Mode mode; // CSOK: VisibilityModifier
+ private final Mode mode;
/**
* Constructs a new BorderProps instance.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=1480018&r1=1480017&r2=1480018&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Tue May 7 18:53:29 2013
@@ -784,7 +784,7 @@ public final class ColorUtil {
/**
* Initializes the colorMap with some predefined values.
*/
- private static void initializeColorMap() { // CSOK: MethodLength
+ private static void initializeColorMap() {
colorMap = Collections.synchronizedMap(new java.util.HashMap<String, Color>());
colorMap.put("aliceblue", createColor(240, 248, 255));
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org