vmote 2003/08/26 10:15:15 Modified: src/java/org/apache/fop/apps Document.java src/java/org/apache/fop/fo FOTreeBuilder.java FOTreeControl.java FOTreeVisitor.java src/java/org/apache/fop/layoutmgr LayoutManagerLS.java Log: move extensions package to fo.extensions (primarily to show that these classes are only related to the FO Tree itself) Revision Changes Path 1.3 +2 -2 xml-fop/src/java/org/apache/fop/apps/Document.java Index: Document.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Document.java 20 Aug 2003 19:46:47 -0000 1.2 +++ Document.java 26 Aug 2003 17:15:14 -0000 1.3 @@ -58,7 +58,7 @@ import org.apache.fop.area.AreaTree; import org.apache.fop.area.AreaTreeModel; -import org.apache.fop.extensions.Bookmarks; +import org.apache.fop.fo.extensions.Bookmarks; import org.apache.fop.fo.FOTreeControl; import org.apache.fop.fo.FOTreeEvent; import org.apache.fop.fo.FOTreeListener; 1.13 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java Index: FOTreeBuilder.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- FOTreeBuilder.java 22 Aug 2003 17:42:41 -0000 1.12 +++ FOTreeBuilder.java 26 Aug 2003 17:15:14 -0000 1.13 @@ -163,7 +163,7 @@ private void setupDefaultMappings() { addElementMapping("org.apache.fop.fo.FOElementMapping"); addElementMapping("org.apache.fop.svg.SVGElementMapping"); - addElementMapping("org.apache.fop.extensions.ExtensionElementMapping"); + addElementMapping("org.apache.fop.fo.extensions.ExtensionElementMapping"); // add mappings from available services Iterator providers = 1.4 +2 -2 xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java Index: FOTreeControl.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- FOTreeControl.java 20 Aug 2003 19:46:47 -0000 1.3 +++ FOTreeControl.java 26 Aug 2003 17:15:14 -0000 1.4 @@ -55,7 +55,7 @@ import java.util.Map; // FOP -import org.apache.fop.extensions.Bookmarks; +import org.apache.fop.fo.extensions.Bookmarks; import org.apache.fop.fonts.FontMetrics; /** 1.2 +5 -5 xml-fop/src/java/org/apache/fop/fo/FOTreeVisitor.java Index: FOTreeVisitor.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeVisitor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FOTreeVisitor.java 19 Aug 2003 00:53:52 -0000 1.1 +++ FOTreeVisitor.java 26 Aug 2003 17:15:14 -0000 1.2 @@ -55,10 +55,10 @@ import org.apache.fop.fo.pagination.ColorProfile; import org.apache.fop.fo.pagination.ConditionalPageMasterReference; import org.apache.fop.fo.pagination.Declarations; -import org.apache.fop.extensions.ExtensionObj; -import org.apache.fop.extensions.Bookmarks; -import org.apache.fop.extensions.Label; -import org.apache.fop.extensions.Outline; +import org.apache.fop.fo.extensions.ExtensionObj; +import org.apache.fop.fo.extensions.Bookmarks; +import org.apache.fop.fo.extensions.Label; +import org.apache.fop.fo.extensions.Outline; import org.apache.fop.fo.flow.ExternalGraphic; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.StaticContent; 1.9 +3 -2 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- LayoutManagerLS.java 22 Aug 2003 17:42:41 -0000 1.8 +++ LayoutManagerLS.java 26 Aug 2003 17:15:14 -0000 1.9 @@ -51,7 +51,7 @@ package org.apache.fop.layoutmgr; import org.apache.fop.area.extensions.BookmarkData; -import org.apache.fop.extensions.Outline; +import org.apache.fop.fo.extensions.Outline; import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.layout.LayoutStrategy; @@ -60,6 +60,7 @@ import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.FOTreeHandler; import org.apache.fop.apps.*; +import org.apache.fop.fo.extensions.*; /** * The implementation of LayoutStrategy for the "redesign" or second generation
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]