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 gm...@apache.org on 2005/03/17 00:18:43 UTC
cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineParent.java
gmazza 2005/03/16 15:18:43
Modified: src/java/org/apache/fop/layoutmgr LineLayoutManager.java
StaticContentLayoutManager.java
AbstractLayoutManager.java
PageSequenceLayoutManager.java
BlockLayoutManager.java LeafNodeLayoutManager.java
LayoutManager.java BlockContainerLayoutManager.java
InlineStackingLayoutManager.java
BlockStackingLayoutManager.java
FlowLayoutManager.java ContentLayoutManager.java
TextLayoutManager.java LeaderLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Cell.java
Caption.java Body.java TableLayoutManager.java
Row.java TableAndCaptionLayoutManager.java
src/java/org/apache/fop/area LineArea.java Area.java
src/java/org/apache/fop/layoutmgr/list
ListItemLayoutManager.java Item.java
ListBlockLayoutManager.java
src/java/org/apache/fop/area/inline InlineParent.java
Log:
Changed from addChild(Area) to clearer addChildArea(Area).
Revision Changes Path
1.42 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- LineLayoutManager.java 8 Mar 2005 15:02:59 -0000 1.41
+++ LineLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.42
@@ -932,7 +932,7 @@
addSpace(lineArea, lc.getTrailingSpace().resolve(true),
lc.getSpaceAdjust());
}
- parentLM.addChild(lineArea);
+ parentLM.addChildArea(lineArea);
}
setCurrentArea(null); // ?? necessary
}
1.8 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Index: StaticContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StaticContentLayoutManager.java 20 Oct 2004 21:07:02 -0000 1.7
+++ StaticContentLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -112,9 +112,9 @@
* Add child area to a the correct container, depending on its
* area class. A Flow can fill at most one area container of any class
* at any one time. The actual work is done by BlockStackingLM.
- * @param childArea child area to add
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
region.addBlock((Block)childArea);
}
1.41 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- AbstractLayoutManager.java 20 Feb 2005 19:50:47 -0000 1.40
+++ AbstractLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.41
@@ -133,7 +133,7 @@
// protected void flush(Area area, boolean bFinished) {
// if (area != null) {
// // area.setFinished(true);
- // parentLM.addChild(area, bFinished); // ????
+ // parentLM.addChildArea(area, bFinished); // ????
// if (bFinished) {
// setCurrentArea(null);
// }
@@ -306,7 +306,7 @@
protected void flush() {
}
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
}
/**
1.50 +3 -4 xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PageSequenceLayoutManager.java 16 Mar 2005 02:38:12 -0000 1.49
+++ PageSequenceLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.50
@@ -358,10 +358,9 @@
/**
* For now, only handle normal flow areas.
- *
- * @param childArea the child area to add
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(org.apache.fop.area.Area)
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (childArea == null) {
return;
}
1.43 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- BlockLayoutManager.java 20 Feb 2005 19:50:47 -0000 1.42
+++ BlockLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.43
@@ -396,9 +396,9 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChild(org.apache.fop.area.Area)
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
if (childArea instanceof LineArea) {
curBlockArea.addLineArea((LineArea) childArea);
1.14 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
Index: LeafNodeLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LeafNodeLayoutManager.java 11 Mar 2005 07:23:43 -0000 1.13
+++ LeafNodeLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.14
@@ -135,7 +135,7 @@
* This is a leaf-node, so this method is never called.
* @param childArea the childArea to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
}
/**
@@ -168,7 +168,7 @@
offsetArea(context);
widthAdjustArea(context);
- parentLM.addChild(curArea);
+ parentLM.addChildArea(curArea);
while (posIter.hasNext()) {
posIter.next();
1.21 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LayoutManager.java 20 Feb 2005 19:50:47 -0000 1.20
+++ LayoutManager.java 16 Mar 2005 23:18:42 -0000 1.21
@@ -155,7 +155,7 @@
*
* @param childArea the child area to add
*/
- void addChild(Area childArea);
+ void addChildArea(Area childArea);
/**
* Tell the layout manager to add all the child areas implied
1.36 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- BlockContainerLayoutManager.java 20 Feb 2005 19:50:47 -0000 1.35
+++ BlockContainerLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.36
@@ -548,9 +548,9 @@
/**
* Add the child to the block container.
*
- * @see org.apache.fop.layoutmgr.LayoutManager#addChild(Area)
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (referenceArea != null) {
referenceArea.addBlock((Block) childArea);
}
1.20 +5 -5 xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
Index: InlineStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- InlineStackingLayoutManager.java 22 Dec 2004 08:54:10 -0000 1.19
+++ InlineStackingLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.20
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -498,7 +498,7 @@
}
setTraits(bAreaCreated, !bIsLast);
- parentLM.addChild(getCurrentArea());
+ parentLM.addChildArea(getCurrentArea());
context.setFlags(LayoutContext.LAST_AREA, bIsLast);
bAreaCreated = true;
}
@@ -515,7 +515,7 @@
}
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
// Make sure childArea is inline area
if (childArea instanceof InlineArea) {
Area parent = getCurrentArea();
@@ -524,7 +524,7 @@
getContext().getLeadingSpace().resolve(false),
getContext().getSpaceAdjust());
}
- parent.addChild(childArea);
+ parent.addChildArea(childArea);
}
}
@@ -554,7 +554,7 @@
//getLogger().debug("Add leading space: " + iAdjust);
Space ls = new Space();
ls.setIPD(iAdjust);
- parentArea.addChild(ls);
+ parentArea.addChildArea(ls);
}
}
}
1.11 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BlockStackingLayoutManager.java 26 Jan 2005 14:55:49 -0000 1.10
+++ BlockStackingLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.11
@@ -88,7 +88,7 @@
if (sp != 0) {
Block spacer = new Block();
spacer.setBPD(sp);
- parentLM.addChild(spacer);
+ parentLM.addChildArea(spacer);
}
}
@@ -122,7 +122,7 @@
* If so, add it. Otherwise initiate breaking.
* @param childArea the area to add: will be some block-stacked Area.
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
addChildToArea(childArea, getCurrentArea());
}
@@ -131,7 +131,7 @@
*/
protected void flush() {
if (getCurrentArea() != null) {
- parentLM.addChild(getCurrentArea());
+ parentLM.addChildArea(getCurrentArea());
}
}
1.12 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FlowLayoutManager.java 4 Feb 2005 08:25:06 -0000 1.11
+++ FlowLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.12
@@ -158,9 +158,9 @@
* Add child area to a the correct container, depending on its
* area class. A Flow can fill at most one area container of any class
* at any one time. The actual work is done by BlockStackingLM.
- * @param childArea child area to add
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
addChildToArea(childArea,
this.currentAreas[childArea.getAreaClass()]);
}
1.24 +5 -3 xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ContentLayoutManager.java 14 Mar 2005 01:34:26 -0000 1.23
+++ ContentLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.24
@@ -182,9 +182,11 @@
return holder;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
- public void addChild(Area childArea) {
- holder.addChild(childArea);
+ /**
+ * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ **/
+ public void addChildArea(Area childArea) {
+ holder.addChildArea(childArea);
}
/**
1.32 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
Index: TextLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TextLayoutManager.java 8 Mar 2005 15:02:59 -0000 1.31
+++ TextLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.32
@@ -622,7 +622,7 @@
word = t;
if (word != null) {
- parentLM.addChild(word);
+ parentLM.addChildArea(word);
}
}
1.17 +5 -5 xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
Index: LeaderLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- LeaderLayoutManager.java 14 Mar 2005 01:34:26 -0000 1.16
+++ LeaderLayoutManager.java 16 Mar 2005 23:18:42 -0000 1.17
@@ -102,9 +102,9 @@
}
FilledArea fa = new FilledArea();
fa.setUnitWidth(width);
- fa.addChild(t);
+ fa.addChildArea(t);
if (spacer != null) {
- fa.addChild(spacer);
+ fa.addChildArea(spacer);
}
fa.setBPD(font.getAscender());
@@ -139,7 +139,7 @@
}
fa.setUnitWidth(width);
if (spacer != null) {
- fa.addChild(spacer);
+ fa.addChildArea(spacer);
}
leaderArea = fa;
}
@@ -222,7 +222,7 @@
clm.addAreas(contentIter, context);
offsetArea(context);
- parentLM.addChild(curArea);
+ parentLM.addChildArea(curArea);
while (posIter.hasNext()) {
posIter.next();
1.26 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Cell.java 22 Feb 2005 15:32:45 -0000 1.25
+++ Cell.java 16 Mar 2005 23:18:43 -0000 1.26
@@ -342,7 +342,7 @@
block.setXOffset(dx + borderStartWidth);
block.setYOffset(dy);
TraitSetter.addCollapsingBorders(block, gu.effBorders, outer);
- parentLM.addChild(block);
+ parentLM.addChildArea(block);
dx += gu.column.getWidth().getValue();
}
dy += lastRowHeight;
@@ -443,7 +443,7 @@
*
* @param childArea the child to add to the cell
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.6 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java
Index: Caption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Caption.java 20 Oct 2004 13:19:25 -0000 1.5
+++ Caption.java 16 Mar 2005 23:18:43 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -193,7 +193,7 @@
*
* @param childArea the child area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.15 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java
Index: Body.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Body.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Body.java 21 Feb 2005 21:52:14 -0000 1.14
+++ Body.java 16 Mar 2005 23:18:43 -0000 1.15
@@ -238,8 +238,8 @@
*
* @param childArea the child area to add
*/
- public void addChild(Area childArea) {
- parentLM.addChild(childArea);
+ public void addChildArea(Area childArea) {
+ parentLM.addChildArea(childArea);
}
/**
1.21 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TableLayoutManager.java 21 Feb 2005 21:52:14 -0000 1.20
+++ TableLayoutManager.java 16 Mar 2005 23:18:43 -0000 1.21
@@ -457,7 +457,7 @@
*
* @param childArea the child area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.26 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Row.java 22 Feb 2005 15:32:45 -0000 1.25
+++ Row.java 16 Mar 2005 23:18:43 -0000 1.26
@@ -531,7 +531,7 @@
rowArea.setIPD(referenceIPD);
rowArea.setXOffset(xoffset);
rowArea.setYOffset(yoffset);
- parentLM.addChild(rowArea);
+ parentLM.addChildArea(rowArea);
}
for (Iterator iter = lfp.cellBreaks.iterator(); iter.hasNext();) {
@@ -586,8 +586,8 @@
*
* @param childArea the child area
*/
- public void addChild(Area childArea) {
- parentLM.addChild(childArea);
+ public void addChildArea(Area childArea) {
+ parentLM.addChildArea(childArea);
}
/**
1.6 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
Index: TableAndCaptionLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TableAndCaptionLayoutManager.java 20 Oct 2004 13:19:25 -0000 1.5
+++ TableAndCaptionLayoutManager.java 16 Mar 2005 23:18:43 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@
*
* @param childArea the area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.4 +2 -2 xml-fop/src/java/org/apache/fop/area/LineArea.java
Index: LineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/LineArea.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LineArea.java 22 Sep 2004 08:18:41 -0000 1.3
+++ LineArea.java 16 Mar 2005 23:18:43 -0000 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
*
* @param childArea the inline child area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (childArea instanceof InlineArea) {
addInlineArea((InlineArea)childArea);
}
1.8 +1 -1 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Area.java 25 Jan 2005 10:42:06 -0000 1.7
+++ Area.java 16 Mar 2005 23:18:43 -0000 1.8
@@ -305,7 +305,7 @@
*
* @param child the child area to add
*/
- public void addChild(Area child) {
+ public void addChildArea(Area child) {
}
/**
1.19 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ListItemLayoutManager.java 28 Jan 2005 16:59:28 -0000 1.18
+++ ListItemLayoutManager.java 16 Mar 2005 23:18:43 -0000 1.19
@@ -325,7 +325,7 @@
*
* @param childArea the child area
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.12 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Item.java 11 Nov 2004 06:38:11 -0000 1.11
+++ Item.java 16 Mar 2005 23:18:43 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -238,7 +238,7 @@
*
* @param childArea the child to add to the cell
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.12 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ListBlockLayoutManager.java 11 Mar 2005 07:23:43 -0000 1.11
+++ ListBlockLayoutManager.java 16 Mar 2005 23:18:43 -0000 1.12
@@ -255,7 +255,7 @@
*
* @param childArea the child area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (curBlockArea != null) {
curBlockArea.addBlock((Block) childArea);
}
1.5 +2 -2 xml-fop/src/java/org/apache/fop/area/inline/InlineParent.java
Index: InlineParent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineParent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InlineParent.java 27 Feb 2004 17:40:58 -0000 1.4
+++ InlineParent.java 16 Mar 2005 23:18:43 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
*
* @param childArea the child area to add
*/
- public void addChild(Area childArea) {
+ public void addChildArea(Area childArea) {
if (childArea instanceof InlineArea) {
inlines.add(childArea);
increaseIPD(((InlineArea) childArea).getAllocIPD());
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineParent.java
Posted by Simon Pepping <sp...@leverkruid.nl>.
On Thu, Mar 17, 2005 at 08:48:03AM +0100, Finn Bock wrote:
> gmazza@apache.org wrote:
>
> >gmazza 2005/03/16 15:18:43
> >
> > Modified: src/java/org/apache/fop/layoutmgr LineLayoutManager.java
> > StaticContentLayoutManager.java
> > AbstractLayoutManager.java
> > PageSequenceLayoutManager.java
> > BlockLayoutManager.java LeafNodeLayoutManager.java
> > LayoutManager.java BlockContainerLayoutManager.java
> > InlineStackingLayoutManager.java
> > BlockStackingLayoutManager.java
> > FlowLayoutManager.java ContentLayoutManager.java
> > TextLayoutManager.java LeaderLayoutManager.java
> > src/java/org/apache/fop/layoutmgr/table Cell.java
> > Caption.java Body.java TableLayoutManager.java
> > Row.java TableAndCaptionLayoutManager.java
> > src/java/org/apache/fop/area LineArea.java Area.java
> > src/java/org/apache/fop/layoutmgr/list
> > ListItemLayoutManager.java Item.java
> > ListBlockLayoutManager.java
> > src/java/org/apache/fop/area/inline InlineParent.java
> > Log:
> > Changed from addChild(Area) to clearer addChildArea(Area).
>
> Yes, that looks like a good example of the kind of change which Jeremias
> kindly asked you not to do right at this moment.
I second that. Glen, other team members than you expect that Jeremias
is about to make important improvements to these LMs, and agree with
Jeremias that your working on the same piece of code is going to
bother his work. Renaming, moving things around and refactoring is the
worst thing you can do at such a time. Code repositories are a
powerful tool, but they do not take away the problems that arise when
two people are working on the same piece of code. Please, leave this
area to Jeremias for the weeks to come.
Regards, Simon
--
Simon Pepping
home page: http://www.leverkruid.nl
Re: cvs commit: xml-fop/src/java/org/apache/fop/area/inline InlineParent.java
Posted by Finn Bock <bc...@worldonline.dk>.
gmazza@apache.org wrote:
> gmazza 2005/03/16 15:18:43
>
> Modified: src/java/org/apache/fop/layoutmgr LineLayoutManager.java
> StaticContentLayoutManager.java
> AbstractLayoutManager.java
> PageSequenceLayoutManager.java
> BlockLayoutManager.java LeafNodeLayoutManager.java
> LayoutManager.java BlockContainerLayoutManager.java
> InlineStackingLayoutManager.java
> BlockStackingLayoutManager.java
> FlowLayoutManager.java ContentLayoutManager.java
> TextLayoutManager.java LeaderLayoutManager.java
> src/java/org/apache/fop/layoutmgr/table Cell.java
> Caption.java Body.java TableLayoutManager.java
> Row.java TableAndCaptionLayoutManager.java
> src/java/org/apache/fop/area LineArea.java Area.java
> src/java/org/apache/fop/layoutmgr/list
> ListItemLayoutManager.java Item.java
> ListBlockLayoutManager.java
> src/java/org/apache/fop/area/inline InlineParent.java
> Log:
> Changed from addChild(Area) to clearer addChildArea(Area).
Yes, that looks like a good example of the kind of change which Jeremias
kindly asked you not to do right at this moment.
sigh.
regards,
finn