From d6e4ff77fecf8e1d07ed27d3b73311c481f205d1 Mon Sep 17 00:00:00 2001 From: "Andreas L. Delmelle" Date: Sun, 6 Feb 2011 19:46:40 +0000 Subject: [PATCH] Move CSOK suppresion comments; apparently @Override causes these to be ignored... git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1067737 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | 4 ++-- .../org/apache/fop/layoutmgr/BlockStackingLayoutManager.java | 4 ++-- .../org/apache/fop/layoutmgr/inline/InlineLayoutManager.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 56f286dd0..b365841d6 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -184,8 +184,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager } /** {@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); diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index 7e1881f77..60e1d6a46 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -242,8 +242,8 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager } /** {@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(); diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index c28cfc608..985094edd 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java @@ -244,8 +244,8 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { } /** {@inheritDoc} */ - @Override - public List getNextKnuthElements // CSOK: MethodLength + @Override // CSOK: MethodLength + public List getNextKnuthElements (LayoutContext context, int alignment) { LayoutManager curLM; -- 2.39.5