From 54647622d9335305d29418776b6fca48b9ebab17 Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Tue, 26 Aug 2003 17:17:59 +0000 Subject: [PATCH] move extensions package to fo.extensions (primarily to show that these classes are only related to the FO Tree itself) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196845 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/apps/Document.java | 2 +- src/java/org/apache/fop/fo/FOTreeBuilder.java | 2 +- src/java/org/apache/fop/fo/FOTreeControl.java | 2 +- src/java/org/apache/fop/fo/FOTreeVisitor.java | 8 ++++---- .../org/apache/fop/{ => fo}/extensions/Bookmarks.java | 5 +++-- .../fop/{ => fo}/extensions/ExtensionElementMapping.java | 6 ++++-- .../org/apache/fop/{ => fo}/extensions/ExtensionObj.java | 4 ++-- src/java/org/apache/fop/{ => fo}/extensions/Label.java | 5 +++-- src/java/org/apache/fop/{ => fo}/extensions/Outline.java | 5 +++-- src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java | 3 ++- 10 files changed, 24 insertions(+), 18 deletions(-) rename src/java/org/apache/fop/{ => fo}/extensions/Bookmarks.java (97%) rename src/java/org/apache/fop/{ => fo}/extensions/ExtensionElementMapping.java (97%) rename src/java/org/apache/fop/{ => fo}/extensions/ExtensionObj.java (96%) rename src/java/org/apache/fop/{ => fo}/extensions/Label.java (97%) rename src/java/org/apache/fop/{ => fo}/extensions/Outline.java (98%) diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java index 081d958b8..6411126de 100644 --- a/src/java/org/apache/fop/apps/Document.java +++ b/src/java/org/apache/fop/apps/Document.java @@ -58,7 +58,7 @@ import java.io.IOException; 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; diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java index 34fa5b4dd..2237bf3e6 100644 --- a/src/java/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java @@ -163,7 +163,7 @@ public class FOTreeBuilder extends DefaultHandler { 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 = diff --git a/src/java/org/apache/fop/fo/FOTreeControl.java b/src/java/org/apache/fop/fo/FOTreeControl.java index ca90f76bf..cee16bf86 100644 --- a/src/java/org/apache/fop/fo/FOTreeControl.java +++ b/src/java/org/apache/fop/fo/FOTreeControl.java @@ -55,7 +55,7 @@ package org.apache.fop.fo; import java.util.Map; // FOP -import org.apache.fop.extensions.Bookmarks; +import org.apache.fop.fo.extensions.Bookmarks; import org.apache.fop.fonts.FontMetrics; /** diff --git a/src/java/org/apache/fop/fo/FOTreeVisitor.java b/src/java/org/apache/fop/fo/FOTreeVisitor.java index e29afaede..8df70f75b 100644 --- a/src/java/org/apache/fop/fo/FOTreeVisitor.java +++ b/src/java/org/apache/fop/fo/FOTreeVisitor.java @@ -55,10 +55,10 @@ import org.apache.fop.fo.flow.Character; 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; diff --git a/src/java/org/apache/fop/extensions/Bookmarks.java b/src/java/org/apache/fop/fo/extensions/Bookmarks.java similarity index 97% rename from src/java/org/apache/fop/extensions/Bookmarks.java rename to src/java/org/apache/fop/fo/extensions/Bookmarks.java index 30bcaa1c2..7f1eb7465 100644 --- a/src/java/org/apache/fop/extensions/Bookmarks.java +++ b/src/java/org/apache/fop/fo/extensions/Bookmarks.java @@ -1,5 +1,5 @@ /* - * $Id: Bookmarks.java,v 1.7 2003/03/05 20:40:18 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,12 +48,13 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.extensions; +package org.apache.fop.fo.extensions; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; import java.util.ArrayList; +import org.apache.fop.extensions.*; /** * Bookmarks data is the top level element of the pdf bookmark extension. diff --git a/src/java/org/apache/fop/extensions/ExtensionElementMapping.java b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java similarity index 97% rename from src/java/org/apache/fop/extensions/ExtensionElementMapping.java rename to src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java index 656d18912..7d6dfbd6b 100644 --- a/src/java/org/apache/fop/extensions/ExtensionElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java @@ -1,5 +1,5 @@ /* - * $Id: ExtensionElementMapping.java,v 1.10 2003/03/05 20:40:18 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,13 +48,15 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.extensions; +package org.apache.fop.fo.extensions; import org.apache.fop.fo.FONode; import org.apache.fop.fo.ElementMapping; import java.util.HashMap; +import org.apache.fop.extensions.*; + /** * Element mapping for the pdf bookmark extension. * This sets up the mapping for the classes that handle the diff --git a/src/java/org/apache/fop/extensions/ExtensionObj.java b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java similarity index 96% rename from src/java/org/apache/fop/extensions/ExtensionObj.java rename to src/java/org/apache/fop/fo/extensions/ExtensionObj.java index 00e827a72..f55728e59 100644 --- a/src/java/org/apache/fop/extensions/ExtensionObj.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java @@ -1,5 +1,5 @@ /* - * $Id: ExtensionObj.java,v 1.7 2003/03/05 20:40:18 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.extensions; +package org.apache.fop.fo.extensions; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; diff --git a/src/java/org/apache/fop/extensions/Label.java b/src/java/org/apache/fop/fo/extensions/Label.java similarity index 97% rename from src/java/org/apache/fop/extensions/Label.java rename to src/java/org/apache/fop/fo/extensions/Label.java index 1ab3db92c..f0ac4a3f3 100644 --- a/src/java/org/apache/fop/extensions/Label.java +++ b/src/java/org/apache/fop/fo/extensions/Label.java @@ -1,5 +1,5 @@ /* - * $Id: Label.java,v 1.7 2003/03/05 20:40:18 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,11 +48,12 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.extensions; +package org.apache.fop.fo.extensions; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; + /** * Labal for PDF bookmark extension. * This element contains the label for the bookmark object. diff --git a/src/java/org/apache/fop/extensions/Outline.java b/src/java/org/apache/fop/fo/extensions/Outline.java similarity index 98% rename from src/java/org/apache/fop/extensions/Outline.java rename to src/java/org/apache/fop/fo/extensions/Outline.java index a2a6520a5..087ad562c 100644 --- a/src/java/org/apache/fop/extensions/Outline.java +++ b/src/java/org/apache/fop/fo/extensions/Outline.java @@ -1,5 +1,5 @@ /* - * $Id: Outline.java,v 1.10 2003/03/05 20:40:18 jeremias Exp $ + * $Id$ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.extensions; +package org.apache.fop.fo.extensions; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; @@ -58,6 +58,7 @@ import java.util.ArrayList; import org.xml.sax.Attributes; + /** * The outline object for the pdf bookmark extension. * The outline element contains a label and optionally more outlines. diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java index e8cbdbc5f..5fa806dc3 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java @@ -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.area.Title; 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 -- 2.39.5