gmazza 2004/06/12 11:03:47
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
LayoutManager.java PageLayoutManager.java
src/java/org/apache/fop/layoutmgr/list
ListItemLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Row.java
TableLayoutManager.java
Log:
Removed get/setUserAgent() initializations from the LayoutManagers. (Infrequently
called, and already obtainable through AbstractLayoutManager's FObj member
variable.)
Revision Changes Path
1.15 +0 -20
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractLayoutManager.java 26 May 2004 04:22:39 -0000 1.14
+++ AbstractLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.15
@@ -68,7 +68,6 @@
*/
public AbstractLayoutManager(FObj fo) {
setFObj(fo);
- setUserAgent(fo.getUserAgent());
}
/**
@@ -101,24 +100,6 @@
protected void initProperties() {
}
- /**
- * Set the user agent.
- *
- * @param ua the user agent
- */
- public void setUserAgent(FOUserAgent ua) {
- userAgent = ua;
- }
-
- /**
- * Get the user agent.
- *
- * @see org.apache.fop.layoutmgr.LayoutManager#getUserAgent()
- */
- public FOUserAgent getUserAgent() {
- return userAgent;
- }
-
public void setParent(LayoutManager lm) {
this.parentLM = lm;
}
@@ -185,7 +166,6 @@
}
while (childLMiter.hasNext()) {
curChildLM = (LayoutManager) childLMiter.next();
- curChildLM.setUserAgent(getUserAgent());
curChildLM.setParent(this);
curChildLM.initialize();
return curChildLM;
1.7 +0 -14 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LayoutManager.java 18 May 2004 11:42:08 -0000 1.6
+++ LayoutManager.java 12 Jun 2004 18:03:47 -0000 1.7
@@ -43,20 +43,6 @@
void setFObj(FObj obj);
/**
- * Set the user agent. For resolving user agent values.
- *
- * @param ua the user agent
- */
- void setUserAgent(FOUserAgent ua);
-
- /**
- * Get the user agent.
- *
- * @return the user agent
- */
- FOUserAgent getUserAgent();
-
- /**
* Set the parent layout manager.
* The parent layout manager is required for adding areas.
*
1.40 +0 -2 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PageLayoutManager.java 27 May 2004 10:52:33 -0000 1.39
+++ PageLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.40
@@ -465,7 +465,6 @@
log.error("no region viewport: shouldn't happen");
}
StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
- lm.setUserAgent(getUserAgent());
lm.initialize();
lm.setRegionReference(reg.getRegion());
lm.setParent(this);
@@ -894,7 +893,6 @@
return lm;
}
lm = new StaticContentLayoutManager();
- lm.setUserAgent(getUserAgent());
lm.setFObj(sc);
staticContentLMs.put(sc.getFlowName(), lm);
return lm;
1.11 +0 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ListItemLayoutManager.java 26 May 2004 04:22:40 -0000 1.10
+++ ListItemLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.11
@@ -106,9 +106,6 @@
// currently active LM
Item curLM;
- label.setUserAgent(getUserAgent());
- body.setUserAgent(getUserAgent());
-
BreakPoss lastPos = null;
List breakList = new ArrayList();
1.13 +0 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Row.java 26 May 2004 04:22:40 -0000 1.12
+++ Row.java 12 Jun 2004 18:03:47 -0000 1.13
@@ -94,7 +94,6 @@
// add cells to list
while (childLMiter.hasNext()) {
curChildLM = (LayoutManager) childLMiter.next();
- curChildLM.setUserAgent(getUserAgent());
curChildLM.setParent(this);
curChildLM.initialize();
cellList.add(curChildLM);
1.12 +0 -2
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TableLayoutManager.java 26 May 2004 04:22:40 -0000 1.11
+++ TableLayoutManager.java 12 Jun 2004 18:03:47 -0000 1.12
@@ -162,7 +162,6 @@
}
MinOptMax headerSize = null;
if (tableHeader != null) {
- tableHeader.setUserAgent(getUserAgent());
tableHeader.resetPosition(null);
headerBreak = getHeight(tableHeader, context);
headerSize = headerBreak.getStackingSize();
@@ -171,7 +170,6 @@
MinOptMax footerSize = null;
if (tableFooter != null) {
- tableFooter.setUserAgent(getUserAgent());
tableFooter.resetPosition(null);
footerBreak = getHeight(tableFooter, context);
footerSize = footerBreak.getStackingSize();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
