Просмотр исходного кода

Minor fixups


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1069915 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-1_1rc1old
Andreas L. Delmelle 13 лет назад
Родитель
Сommit
4db1797fc7

+ 6
- 13
src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java Просмотреть файл

@@ -19,7 +19,6 @@

package org.apache.fop.layoutmgr.list;

import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;

@@ -51,9 +50,7 @@ import org.apache.fop.traits.SpaceVal;
public class ListBlockLayoutManager extends BlockStackingLayoutManager
implements ConditionalElementListener {

/**
* logging instance
*/
/** logging instance */
private static Log log = LogFactory.getLog(ListBlockLayoutManager.class);

private Block curBlockArea;
@@ -122,13 +119,6 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager
return returnList;
}

/** {@inheritDoc} */
@Override
public List getChangedKnuthElements(List oldList, int alignment) {
//log.debug("LBLM.getChangedKnuthElements>");
return super.getChangedKnuthElements(oldList, alignment);
}

/**
* The table area is a reference area that contains areas for
* columns, bodies, rows and the contents are in cells.
@@ -137,8 +127,7 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager
* @param layoutContext the layout context for adding areas
*/
@Override
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
getParentArea(null);

// if this will create the first block area in a page
@@ -263,6 +252,7 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager
*
* @param childArea the child area to add
*/
@Override
public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
@@ -270,16 +260,19 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager
}

/** {@inheritDoc} */
@Override
public KeepProperty getKeepTogetherProperty() {
return getListBlockFO().getKeepTogether();
}

/** {@inheritDoc} */
@Override
public KeepProperty getKeepWithPreviousProperty() {
return getListBlockFO().getKeepWithPrevious();
}

/** {@inheritDoc} */
@Override
public KeepProperty getKeepWithNextProperty() {
return getListBlockFO().getKeepWithNext();
}

+ 4
- 8
src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java Просмотреть файл

@@ -83,13 +83,6 @@ public class ListItemContentLayoutManager extends BlockStackingLayoutManager {
xoffset = off;
}

/** {@inheritDoc} */
@Override
public List getChangedKnuthElements(List oldList, int alignment) {
//log.debug(" ListItemContentLayoutManager.getChanged>");
return super.getChangedKnuthElements(oldList, alignment);
}

/**
* Add the areas for the break points.
* The list item contains block stacking layout managers
@@ -183,6 +176,7 @@ public class ListItemContentLayoutManager extends BlockStackingLayoutManager {
curBlockArea.setPositioning(Block.ABSOLUTE);
// set position
curBlockArea.setXOffset(xoffset);
//TODO: Check - itemIPD never set?
curBlockArea.setIPD(itemIPD);
//curBlockArea.setHeight();

@@ -211,19 +205,21 @@ public class ListItemContentLayoutManager extends BlockStackingLayoutManager {
}

/** {@inheritDoc} */
@Override
public KeepProperty getKeepTogetherProperty() {
return getPartFO().getKeepTogether();
}

/** {@inheritDoc} */
@Override
public Keep getKeepWithNext() {
return Keep.KEEP_AUTO;
}

/** {@inheritDoc} */
@Override
public Keep getKeepWithPrevious() {
return Keep.KEEP_AUTO;
}

}


Загрузка…
Отмена
Сохранить