gmazza 2004/03/17 16:22:40
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
AddLMVisitor.java ContentLayoutManager.java
LayoutManagerLS.java LayoutProcessor.java
LineLayoutManager.java PageLayoutManager.java
RetrieveMarkerLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Row.java
Log:
Switch from init() to clearer initialize() in Layout classes; removed
unneeded logger reference in ContentLayoutManager.
Revision Changes Path
1.8 +4 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractLayoutManager.java 12 Mar 2004 00:41:04 -0000 1.7
+++ AbstractLayoutManager.java 18 Mar 2004 00:22:40 -0000 1.8
@@ -165,7 +165,7 @@
curChildLM = (LayoutProcessor) childLMiter.next();
curChildLM.setUserAgent(getUserAgent());
curChildLM.setParent(this);
- curChildLM.init();
+ curChildLM.initialize();
return curChildLM;
}
return null;
@@ -222,10 +222,10 @@
/**
- * This method provides a hook for a LayoutManager to intialize traits
+ * This method provides a hook for a LayoutManager to initialize traits
* for the areas it will create, based on Properties set on its FO.
*/
- public void init() {
+ public void initialize() {
if (fobj != null && bInited == false) {
initProperties(fobj.getPropertyManager());
bInited = true;
@@ -233,7 +233,7 @@
}
/**
- * This method provides a hook for a LayoutManager to intialize traits
+ * This method provides a hook for a LayoutManager to initialize traits
* for the areas it will create, based on Properties set on its FO.
*/
protected void initProperties(PropertyManager pm) {
1.34 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- AddLMVisitor.java 17 Mar 2004 03:54:53 -0000 1.33
+++ AddLMVisitor.java 18 Mar 2004 00:22:40 -0000 1.34
@@ -369,7 +369,7 @@
lm.setUserAgent(node.getUserAgent());
lm.setFObj(node);
lm.setLMiter(new LMiter(lm, node.getChildren()));
- lm.init();
+ lm.initialize();
// get breaks then add areas to FilledArea
FilledArea fa = new FilledArea();
1.7 +1 -11
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContentLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.6
+++ ContentLayoutManager.java 18 Mar 2004 00:22:40 -0000 1.7
@@ -25,8 +25,6 @@
import org.apache.fop.area.Resolveable;
import org.apache.fop.area.PageViewport;
-import org.apache.avalon.framework.logger.Logger;
-
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
@@ -163,14 +161,6 @@
return userAgent;
}
- /**
- * Returns the logger
- * @return the logger
- */
- protected Logger getLogger() {
- return userAgent.getLogger();
- }
-
/** @see org.apache.fop.layoutmgr.LayoutManager */
public void setParent(LayoutProcessor lm) {
parentLM = lm;
@@ -208,7 +198,7 @@
public void addAreas(PositionIterator posIter, LayoutContext context) { }
/** @see org.apache.fop.layoutmgr.LayoutManager */
- public void init() {
+ public void initialize() {
//to be done
}
1.21 +4 -4 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LayoutManagerLS.java 27 Feb 2004 17:49:25 -0000 1.20
+++ LayoutManagerLS.java 18 Mar 2004 00:22:40 -0000 1.21
@@ -100,8 +100,6 @@
* @return the Title area
*/
public org.apache.fop.area.Title
getTitleArea(org.apache.fop.fo.pagination.Title foTitle) {
- org.apache.fop.area.Title title =
- new org.apache.fop.area.Title();
// use special layout manager to add the inline areas
// to the Title.
InlineStackingLayoutManager lm;
@@ -109,9 +107,11 @@
lm.setUserAgent(foTitle.getUserAgent());
lm.setFObj(foTitle);
lm.setLMiter(new LMiter(lm, foTitle.children.listIterator()));
- lm.init();
+ lm.initialize();
// get breaks then add areas to title
+ org.apache.fop.area.Title title =
+ new org.apache.fop.area.Title();
ContentLayoutManager clm = new ContentLayoutManager(title);
clm.setUserAgent(foTitle.getUserAgent());
1.5 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java
Index: LayoutProcessor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LayoutProcessor.java 27 Feb 2004 17:49:25 -0000 1.4
+++ LayoutProcessor.java 18 Mar 2004 00:22:40 -0000 1.5
@@ -54,9 +54,9 @@
LayoutManagerLS getLayoutManagerLS();
/**
- * Initialise this layout manager.
+ * Initialize this layout manager.
*/
- void init();
+ void initialize();
/**
* Generates inline areas.
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LineLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.14
+++ LineLayoutManager.java 18 Mar 2004 00:22:40 -0000 1.15
@@ -102,7 +102,7 @@
lineHeight = lh;
lead = l;
follow = f;
- init(); // Normally done when started by parent!
+ initialize(); // Normally done when started by parent!
}
/**
1.32 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.31
+++ PageLayoutManager.java 18 Mar 2004 00:22:40 -0000 1.32
@@ -462,7 +462,7 @@
}
StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
lm.setUserAgent(getUserAgent());
- lm.init();
+ lm.initialize();
lm.setRegionReference(reg.getRegion());
lm.setParent(this);
LayoutContext childLC = new LayoutContext(0);
1.5 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
Index: RetrieveMarkerLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RetrieveMarkerLayoutManager.java 27 Feb 2004 17:49:25 -0000 1.4
+++ RetrieveMarkerLayoutManager.java 18 Mar 2004 00:22:40 -0000 1.5
@@ -96,7 +96,7 @@
if (list.size() > 0) {
replaceLM = (LayoutProcessor)list.get(0);
replaceLM.setParent(this);
- replaceLM.init();
+ replaceLM.initialize();
getLogger().debug("retrieved: " + replaceLM + ":" +
list.size());
} else {
getLogger().debug("found no marker with name: " + name);
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Row.java 27 Feb 2004 17:48:35 -0000 1.8
+++ Row.java 18 Mar 2004 00:22:40 -0000 1.9
@@ -95,7 +95,7 @@
curChildLM = (LayoutProcessor) childLMiter.next();
curChildLM.setUserAgent(getUserAgent());
curChildLM.setParent(this);
- curChildLM.init();
+ curChildLM.initialize();
cellList.add(curChildLM);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
