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 ad...@apache.org on 2011/02/06 20:46:41 UTC
svn commit: r1067737 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr:
BlockContainerLayoutManager.java BlockStackingLayoutManager.java
inline/InlineLayoutManager.java
Author: adelmelle
Date: Sun Feb 6 19:46:40 2011
New Revision: 1067737
URL: http://svn.apache.org/viewvc?rev=1067737&view=rev
Log:
Move CSOK suppresion comments; apparently @Override causes these to be ignored...
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1067737&r1=1067736&r2=1067737&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Sun Feb 6 19:46:40 2011
@@ -184,8 +184,8 @@ public class BlockContainerLayoutManager
}
/** {@inheritDoc} */
- @Override
- public List getNextKnuthElements // CSOK: MethodLength
+ @Override // CSOK: MethodLength
+ public List getNextKnuthElements
(LayoutContext context, int alignment, Stack lmStack,
Position restartPosition, LayoutManager restartAtLM) {
boolean isRestart = (lmStack != null);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=1067737&r1=1067736&r2=1067737&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Sun Feb 6 19:46:40 2011
@@ -242,8 +242,8 @@ public abstract class BlockStackingLayou
}
/** {@inheritDoc} */
- @Override
- public List getNextKnuthElements // CSOK: MethodLength
+ @Override // CSOK: MethodLength
+ public List getNextKnuthElements
(LayoutContext context, int alignment, Stack lmStack,
Position restartPosition, LayoutManager restartAtLM) {
referenceIPD = context.getRefIPD();
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=1067737&r1=1067736&r2=1067737&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 Sun Feb 6 19:46:40 2011
@@ -244,8 +244,8 @@ public class InlineLayoutManager extends
}
/** {@inheritDoc} */
- @Override
- public List getNextKnuthElements // CSOK: MethodLength
+ @Override // CSOK: MethodLength
+ public List getNextKnuthElements
(LayoutContext context, int alignment) {
LayoutManager curLM;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org