PR:

Obtained from:
Submitted by:
Reviewed by:
Switch from init() to clearer initialize() in Layout classes; removed
unneeded logger reference in ContentLayoutManager.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197460 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 15 insertions, 25 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index a1e20cd7f..451db4ae3 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -165,7 +165,7 @@ public abstract class AbstractLayoutManager implements LayoutProcessor, Constant
             curChildLM = (LayoutProcessor) childLMiter.next();
             curChildLM.setUserAgent(getUserAgent());
             curChildLM.setParent(this);
-            curChildLM.init();
+            curChildLM.initialize();
             return curChildLM;
         }
         return null;
@@ -222,10 +222,10 @@ public abstract class AbstractLayoutManager implements LayoutProcessor, Constant
 
 
     /**
-     * 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 @@ public abstract class AbstractLayoutManager implements LayoutProcessor, Constant
     }
 
     /**
-     * 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) {
diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index 5670b4246..117bf4c31 100644
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -369,7 +369,7 @@ public class AddLMVisitor implements FOTreeVisitor {
              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();
diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index 0f352040b..81829d374 100644
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -25,8 +25,6 @@ import org.apache.fop.area.Area;
 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 @@ public class ContentLayoutManager implements LayoutProcessor {
         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 class ContentLayoutManager implements LayoutProcessor {
     public void addAreas(PositionIterator posIter, LayoutContext context) { }
 
     /** @see org.apache.fop.layoutmgr.LayoutManager */
-    public void init() {
+    public void initialize() {
         //to be done
     }
 
diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
index dad27c6e6..4084d0430 100644
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
@@ -100,8 +100,6 @@ public class LayoutManagerLS extends LayoutStrategy {
      * @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 @@ public class LayoutManagerLS extends LayoutStrategy {
         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());
diff --git a/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java b/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java
index 0e53f2cab..92a3ed923 100644
--- a/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutProcessor.java
@@ -54,9 +54,9 @@ public interface LayoutProcessor extends LayoutManager {
     LayoutManagerLS getLayoutManagerLS();
 
     /**
-     * Initialise this layout manager.
+     * Initialize this layout manager.
      */
-    void init();
+    void initialize();
 
     /**
      * Generates inline areas.
diff --git a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
index 281f9674d..0675e3fdb 100644
--- a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
@@ -102,7 +102,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager {
         lineHeight = lh;
         lead = l;
         follow = f;
-        init(); // Normally done when started by parent!
+        initialize(); // Normally done when started by parent!
     }
 
     /**
diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index 5687ca127..ae7274148 100644
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -462,7 +462,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
         }
         StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
         lm.setUserAgent(getUserAgent());
-        lm.init();
+        lm.initialize();
         lm.setRegionReference(reg.getRegion());
         lm.setParent(this);
         LayoutContext childLC = new LayoutContext(0);
diff --git a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
index e2be8c90b..cc7d89a1d 100644
--- a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java
@@ -96,7 +96,7 @@ public class RetrieveMarkerLayoutManager extends AbstractLayoutManager {
                 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);
diff --git a/src/java/org/apache/fop/layoutmgr/table/Row.java b/src/java/org/apache/fop/layoutmgr/table/Row.java
index 6c4c5f90a..1d4df5861 100644
--- a/src/java/org/apache/fop/layoutmgr/table/Row.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Row.java
@@ -95,7 +95,7 @@ public class Row extends BlockStackingLayoutManager {
             curChildLM = (LayoutProcessor) childLMiter.next();
             curChildLM.setUserAgent(getUserAgent());
             curChildLM.setParent(this);
-            curChildLM.init();
+            curChildLM.initialize();
             cellList.add(curChildLM);
         }
     }