gmazza 2004/10/01 21:34:13
Modified: src/java/org/apache/fop/area AreaTreeHandler.java
src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
src/java/org/apache/fop/render/rtf
TableAttributesConverter.java
Log:
1.) Temporary commenting out of TableAttributesConverter code until
missing code checked in.
2.) Code simplification of having AbstractLayoutManager call the
fObj.AddLayoutManager()
directly.
Revision Changes Path
1.12 +1 -16 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AreaTreeHandler.java 27 Sep 2004 04:54:31 -0000 1.11
+++ AreaTreeHandler.java 2 Oct 2004 04:34:13 -0000 1.12
@@ -35,7 +35,6 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.extensions.BookmarkData;
import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.FObj;
import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fo.pagination.PageSequence;
@@ -78,9 +77,6 @@
// count of number of pages rendered
private int pageCount;
- /** The List object to which FO's should add Layout Managers */
- protected List currentLMList;
-
// AreaTreeModel in use
private AreaTreeModel model;
@@ -337,17 +333,6 @@
pageSLM.run();
pageSequence.setCurrentPageNumber(pageSLM.getPageCount());
}
- }
-
- /**
- *
- * @param fobj the FObj object for which a layout manager should be created
- * @param lmList the list to which the newly created layout manager(s)
- * should be added
- */
- public void addLayoutManager(FObj fobj, List lmList) {
- currentLMList = lmList;
- fobj.addLayoutManager(currentLMList);
}
}
1.23 +1 -1
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AbstractLayoutManager.java 7 Sep 2004 20:47:11 -0000 1.22
+++ AbstractLayoutManager.java 2 Oct 2004 04:34:13 -0000 1.23
@@ -421,7 +421,7 @@
Object theobj = fobjIter.next();
if (theobj instanceof FObj) {
FObj fobj = (FObj) theobj;
- areaTreeHandler.addLayoutManager(fobj, newLMs);
+ fobj.addLayoutManager(newLMs);
}
}
return newLMs;
1.17 +5 -3
xml-fop/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
Index: TableAttributesConverter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TableAttributesConverter.java 1 Oct 2004 09:46:36 -0000 1.16
+++ TableAttributesConverter.java 2 Oct 2004 04:34:13 -0000 1.17
@@ -118,7 +118,7 @@
}
}
-
+/*
BorderAttributesConverter.makeBorder(propList, attrib,
ITableAttributes.CELL_BORDER_TOP,
Constants.PR_BORDER_TOP_COLOR,
Constants.PR_BORDER_TOP_STYLE,
@@ -135,7 +135,7 @@
Constants.PR_BORDER_RIGHT_COLOR,
Constants.PR_BORDER_RIGHT_STYLE,
Constants.PR_BORDER_RIGHT_WIDTH);
-
+*/
int n =
fobj.getProperty(Constants.PR_NUMBER_COLUMNS_SPANNED).getNumber().intValue();
// Column spanning :
if (n > 1) {
@@ -215,6 +215,7 @@
* place.
*/
PropertyList propList = fobj.getPropertyList();
+/*
BorderAttributesConverter.makeBorder(propList, attrib,
ITableAttributes.CELL_BORDER_TOP,
Constants.PR_BORDER_TOP_COLOR,
Constants.PR_BORDER_TOP_STYLE,
@@ -231,6 +232,7 @@
Constants.PR_BORDER_RIGHT_COLOR,
Constants.PR_BORDER_RIGHT_STYLE,
Constants.PR_BORDER_RIGHT_WIDTH);
+*/
/*
ep = (EnumProperty)fobj.getProperty(Constants.PR_BORDER_TOP_STYLE);
if (ep != null && ep.getEnum() != Constants.NONE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
