From a47a0676d84c199f2208fafbf234a6cf7041a883 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Tue, 4 Nov 2003 23:59:14 +0000 Subject: [PATCH] RTF structural renderer moved from root to render.rtf, joining all the other renderers RTF Library moved from root to render.rtf.rtflib, but kept separate from renderer itself. See: http://marc.theaimsgroup.com/?l=fop-dev&m=106753338719406&w=2 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196981 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 6 +-- src/java/org/apache/fop/apps/Driver.java | 4 +- .../rtf}/BuilderContext.java | 6 +-- .../rtf}/FoUnitsConverter.java | 2 +- .../rtf}/PageAttributesConverter.java | 6 +-- .../renderer => render/rtf}/RTFHandler.java | 46 +++++++++---------- .../rtf}/TableAttributesConverter.java | 10 ++-- .../renderer => render/rtf}/TableContext.java | 6 +-- .../rtf}/TextAttributesConverter.java | 10 ++-- .../rtf/rtflib/exceptions/RtfException.java | 2 +- .../exceptions/RtfStructureException.java | 2 +- .../rtf/rtflib/exceptions/package.html | 2 +- .../rtflib/interfaces/ITableColumnsInfo.java | 2 +- .../rtf/rtflib/interfaces/package.html | 2 +- .../rtfdoc/BorderAttributesConverter.java | 2 +- .../rtf/rtflib/rtfdoc/IRtfAfterContainer.java | 2 +- .../rtflib/rtfdoc/IRtfBeforeContainer.java | 2 +- .../rtflib/rtfdoc/IRtfBookmarkContainer.java | 2 +- .../rtfdoc/IRtfExternalGraphicContainer.java | 2 +- .../rtflib/rtfdoc/IRtfHyperLinkContainer.java | 2 +- .../rtflib/rtfdoc/IRtfJforCmdContainer.java | 2 +- .../rtf/rtflib/rtfdoc/IRtfListContainer.java | 2 +- .../rtf/rtflib/rtfdoc/IRtfOptions.java | 2 +- .../rtflib/rtfdoc/IRtfPageBreakContainer.java | 2 +- .../rtf/rtflib/rtfdoc/IRtfPageContainer.java | 2 +- .../IRtfPageNumberCitationContainer.java | 2 +- .../rtfdoc/IRtfPageNumberContainer.java | 2 +- .../rtflib/rtfdoc/IRtfParagraphContainer.java | 2 +- .../IRtfParagraphKeepTogetherContainer.java | 2 +- .../rtf/rtflib/rtfdoc/IRtfTableContainer.java | 4 +- .../rtf/rtflib/rtfdoc/IRtfTextContainer.java | 2 +- .../rtflib/rtfdoc/IRtfTextrunContainer.java | 6 +-- .../rtf/rtflib/rtfdoc/ITableAttributes.java | 2 +- .../rtflib/rtfdoc/IrtfTemplateContainer.java | 2 +- .../rtfdoc/ParagraphKeeptogetherContext.java | 2 +- .../rtf/rtflib/rtfdoc/RtfAfter.java | 2 +- .../rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java | 4 +- .../rtf/rtflib/rtfdoc/RtfAttributes.java | 2 +- .../rtf/rtflib/rtfdoc/RtfBefore.java | 2 +- .../rtf/rtflib/rtfdoc/RtfBookmark.java | 2 +- .../rtfdoc/RtfBookmarkContainerImpl.java | 2 +- .../rtf/rtflib/rtfdoc/RtfColorTable.java | 2 +- .../rtf/rtflib/rtfdoc/RtfContainer.java | 4 +- .../rtf/rtflib/rtfdoc/RtfDocumentArea.java | 2 +- .../rtf/rtflib/rtfdoc/RtfElement.java | 4 +- .../rtf/rtflib/rtfdoc/RtfExternalGraphic.java | 10 ++-- .../rtf/rtflib/rtfdoc/RtfExtraRowSet.java | 4 +- .../rtf/rtflib/rtfdoc/RtfFile.java | 4 +- .../rtf/rtflib/rtfdoc/RtfFontManager.java | 2 +- .../rtf/rtflib/rtfdoc/RtfFontTable.java | 2 +- .../rtf/rtflib/rtfdoc/RtfHeader.java | 4 +- .../rtf/rtflib/rtfdoc/RtfHyperLink.java | 2 +- .../rtf/rtflib/rtfdoc/RtfJforCmd.java | 2 +- .../rtf/rtflib/rtfdoc/RtfLineBreak.java | 2 +- .../rtf/rtflib/rtfdoc/RtfList.java | 2 +- .../rtf/rtflib/rtfdoc/RtfListItem.java | 2 +- .../rtf/rtflib/rtfdoc/RtfListTable.java | 4 +- .../rtf/rtflib/rtfdoc/RtfNull.java | 2 +- .../rtf/rtflib/rtfdoc/RtfOptions.java | 2 +- .../rtf/rtflib/rtfdoc/RtfPage.java | 2 +- .../rtf/rtflib/rtfdoc/RtfPageArea.java | 2 +- .../rtf/rtflib/rtfdoc/RtfPageBreak.java | 2 +- .../rtf/rtflib/rtfdoc/RtfPageNumber.java | 2 +- .../rtflib/rtfdoc/RtfPageNumberCitation.java | 2 +- .../rtf/rtflib/rtfdoc/RtfParagraph.java | 2 +- .../rtfdoc/RtfParagraphKeepTogether.java | 2 +- .../rtf/rtflib/rtfdoc/RtfSection.java | 4 +- .../rtf/rtflib/rtfdoc/RtfString.java | 2 +- .../rtf/rtflib/rtfdoc/RtfStringConverter.java | 2 +- .../rtf/rtflib/rtfdoc/RtfStyleSheetTable.java | 2 +- .../rtf/rtflib/rtfdoc/RtfTable.java | 4 +- .../rtf/rtflib/rtfdoc/RtfTableCell.java | 4 +- .../rtf/rtflib/rtfdoc/RtfTableRow.java | 2 +- .../rtf/rtflib/rtfdoc/RtfTemplate.java | 2 +- .../rtf/rtflib/rtfdoc/RtfText.java | 2 +- .../rtf/rtflib/rtfdoc/RtfTextrun.java | 4 +- .../rtflib/rtfdoc/WhitespaceCollapser.java | 2 +- .../rtf/rtflib/rtfdoc/package.html | 2 +- .../rtf/rtflib/testdocs/BasicLink.java | 10 ++-- .../rtflib/testdocs/CreateTestDocuments.java | 4 +- .../testdocs/DummyTableColumnsInfo.java | 4 +- .../rtf/rtflib/testdocs/ExternalGraphic.java | 10 ++-- .../rtf/rtflib/testdocs/ListInTable.java | 18 ++++---- .../rtf/rtflib/testdocs/MergedTableCells.java | 12 ++--- .../rtf/rtflib/testdocs/NestedTable.java | 14 +++--- .../rtflib/testdocs/ParagraphAlignment.java | 12 ++--- .../rtf/rtflib/testdocs/SimpleDocument.java | 8 ++-- .../rtf/rtflib/testdocs/SimpleLists.java | 12 ++--- .../rtf/rtflib/testdocs/SimpleTable.java | 12 ++--- .../rtf/rtflib/testdocs/TestDocument.java | 12 ++--- .../rtf/rtflib/testdocs/TextAttributes.java | 12 ++--- .../rtf/rtflib/testdocs/Whitespace.java | 8 ++-- .../rtf/rtflib/testdocs/package.html | 2 +- .../rtf/rtflib/tools/ImageConstants.java | 2 +- .../rtf/rtflib/tools/ImageUtil.java | 2 +- .../rtf/rtflib/tools/package.html | 2 +- .../org/apache/fop/rtf/rtflib/package.html | 7 --- 97 files changed, 213 insertions(+), 220 deletions(-) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/BuilderContext.java (97%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/FoUnitsConverter.java (99%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/PageAttributesConverter.java (97%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/RTFHandler.java (95%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/TableAttributesConverter.java (98%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/TableContext.java (97%) rename src/java/org/apache/fop/{rtf/renderer => render/rtf}/TextAttributesConverter.java (97%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/exceptions/RtfException.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/exceptions/RtfStructureException.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/exceptions/package.html (60%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/interfaces/ITableColumnsInfo.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/interfaces/package.html (51%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/BorderAttributesConverter.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfAfterContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfListContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfOptions.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfPageContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfTableContainer.java (97%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfTextContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java (94%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/ITableAttributes.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfAfter.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfAttributes.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfBefore.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfBookmark.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfColorTable.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfContainer.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfDocumentArea.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfElement.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfExternalGraphic.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfExtraRowSet.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfFile.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfFontManager.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfFontTable.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfHeader.java (97%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfHyperLink.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfJforCmd.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfLineBreak.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfList.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfListItem.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfListTable.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfNull.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfOptions.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfPage.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfPageArea.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfPageBreak.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfPageNumber.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfParagraph.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfSection.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfString.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfStringConverter.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java (99%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfTable.java (98%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfTableCell.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfTableRow.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfTemplate.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfText.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/RtfTextrun.java (98%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/WhitespaceCollapser.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/rtfdoc/package.html (65%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/BasicLink.java (93%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/CreateTestDocuments.java (97%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/DummyTableColumnsInfo.java (96%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/ExternalGraphic.java (94%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/ListInTable.java (90%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/MergedTableCells.java (95%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/NestedTable.java (96%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/ParagraphAlignment.java (92%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/SimpleDocument.java (94%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/SimpleLists.java (93%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/SimpleTable.java (92%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/TestDocument.java (92%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/TextAttributes.java (92%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/Whitespace.java (94%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/testdocs/package.html (64%) rename src/java/org/apache/fop/{ => render}/rtf/rtflib/tools/ImageConstants.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/tools/ImageUtil.java (99%) mode change 100755 => 100644 rename src/java/org/apache/fop/{ => render}/rtf/rtflib/tools/package.html (54%) delete mode 100644 src/java/org/apache/fop/rtf/rtflib/package.html diff --git a/build.xml b/build.xml index e9b1e3230..18f47ed91 100644 --- a/build.xml +++ b/build.xml @@ -767,7 +767,7 @@ list of possible build targets. - + @@ -782,8 +782,8 @@ list of possible build targets. - - + + diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index dd07514ba..52d05da2a 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -59,10 +59,10 @@ import org.apache.fop.fo.FOTreeBuilder; import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.FOTreeHandler; -import org.apache.fop.render.mif.MIFHandler; import org.apache.fop.render.Renderer; import org.apache.fop.render.awt.AWTRenderer; -import org.apache.fop.rtf.renderer.RTFHandler; +import org.apache.fop.render.mif.MIFHandler; +import org.apache.fop.render.rtf.RTFHandler; import org.apache.fop.tools.DocumentInputSource; import org.apache.fop.tools.DocumentReader; import org.apache.fop.layoutmgr.LayoutManagerLS; diff --git a/src/java/org/apache/fop/rtf/renderer/BuilderContext.java b/src/java/org/apache/fop/render/rtf/BuilderContext.java similarity index 97% rename from src/java/org/apache/fop/rtf/renderer/BuilderContext.java rename to src/java/org/apache/fop/render/rtf/BuilderContext.java index 6d530b274..a1b9ad1b6 100644 --- a/src/java/org/apache/fop/rtf/renderer/BuilderContext.java +++ b/src/java/org/apache/fop/render/rtf/BuilderContext.java @@ -48,11 +48,11 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; import java.util.Stack; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfOptions; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfOptions; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfContainer; /** A BuilderContext holds context information when building an RTF document diff --git a/src/java/org/apache/fop/rtf/renderer/FoUnitsConverter.java b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java similarity index 99% rename from src/java/org/apache/fop/rtf/renderer/FoUnitsConverter.java rename to src/java/org/apache/fop/render/rtf/FoUnitsConverter.java index 5451c71ca..04d1884e3 100644 --- a/src/java/org/apache/fop/rtf/renderer/FoUnitsConverter.java +++ b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java @@ -48,7 +48,7 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; import java.util.Map; import java.util.HashMap; diff --git a/src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java similarity index 97% rename from src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java rename to src/java/org/apache/fop/render/rtf/PageAttributesConverter.java index 4f1bc58af..f65b3bf0c 100644 --- a/src/java/org/apache/fop/rtf/renderer/PageAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java @@ -48,15 +48,15 @@ * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.logger.ConsoleLogger; //FOP import org.apache.fop.apps.FOPException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfPage; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfPage; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.Property; diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java similarity index 95% rename from src/java/org/apache/fop/rtf/renderer/RTFHandler.java rename to src/java/org/apache/fop/render/rtf/RTFHandler.java index 9a235a2bd..85c07e96a 100644 --- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -1,5 +1,5 @@ /* - * $Id: RTFHandler.java,v 1.4 2003/03/07 09:47:56 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.rtf.renderer; +package org.apache.fop.render.rtf; // Java import java.io.IOException; @@ -80,27 +80,27 @@ import org.apache.fop.fo.properties.Constants; import org.apache.fop.fo.Property; import org.apache.fop.fo.PropertyList; import org.apache.fop.apps.Document; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfAfterContainer; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfBeforeContainer; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfPageNumberContainer; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfParagraphContainer; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfTextrunContainer; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAfter; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfBefore; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfElement; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfFile; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfFontManager; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfText; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTextrun; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell; -import org.apache.fop.rtf.rtflib.rtfdoc.IRtfTableContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfAfterContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfBeforeContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfPageNumberContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfParagraphContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfTextrunContainer; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAfter; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfBefore; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfElement; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFontManager; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTextrun; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell; +import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfTableContainer; import org.xml.sax.SAXException; /** diff --git a/src/java/org/apache/fop/rtf/renderer/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java similarity index 98% rename from src/java/org/apache/fop/rtf/renderer/TableAttributesConverter.java rename to src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index 6c34f669e..3a08ee0c0 100644 --- a/src/java/org/apache/fop/rtf/renderer/TableAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java @@ -48,10 +48,10 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; //RTF -import org.apache.fop.rtf.rtflib.rtfdoc.BorderAttributesConverter; +import org.apache.fop.render.rtf.rtflib.rtfdoc.BorderAttributesConverter; //FOP import org.apache.avalon.framework.logger.Logger; @@ -68,9 +68,9 @@ import org.apache.fop.fo.ColorTypeProperty; import org.apache.fop.fo.NumberProperty; import org.apache.fop.datatypes.ColorType; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.apache.fop.rtf.rtflib.rtfdoc.ITableAttributes; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.ITableAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable; /** * Contributor(s): diff --git a/src/java/org/apache/fop/rtf/renderer/TableContext.java b/src/java/org/apache/fop/render/rtf/TableContext.java similarity index 97% rename from src/java/org/apache/fop/rtf/renderer/TableContext.java rename to src/java/org/apache/fop/render/rtf/TableContext.java index cd281f17b..2f2baa72e 100644 --- a/src/java/org/apache/fop/rtf/renderer/TableContext.java +++ b/src/java/org/apache/fop/render/rtf/TableContext.java @@ -48,14 +48,14 @@ * James Tauber . For more information on the Apache * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; import java.util.ArrayList; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.Logger; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** Used when handling fo:table to hold information to build the table. diff --git a/src/java/org/apache/fop/rtf/renderer/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java similarity index 97% rename from src/java/org/apache/fop/rtf/renderer/TextAttributesConverter.java rename to src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index 522cc8749..be4d79cf4 100644 --- a/src/java/org/apache/fop/rtf/renderer/TextAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java @@ -48,7 +48,7 @@ * Software Foundation, please see . */ -package org.apache.fop.rtf.renderer; +package org.apache.fop.render.rtf; //XML import org.xml.sax.Attributes; @@ -70,10 +70,10 @@ import org.apache.fop.fo.NumberProperty; import org.apache.fop.datatypes.ColorType; //RTF -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfFontManager; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfText; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFontManager; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText; /** Converts FO properties to RtfAttributes diff --git a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java rename to src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java index 1d4e19191..b4d21ab47 --- a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.exceptions; +package org.apache.fop.render.rtf.rtflib.exceptions; /** Base class for rtflib exceptions. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java rename to src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java index 7349057c7..3fe9174d3 --- a/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.exceptions; +package org.apache.fop.render.rtf.rtflib.exceptions; /** Thrown when a method call would lead to an invalid RTF document structure. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/exceptions/package.html b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/package.html similarity index 60% rename from src/java/org/apache/fop/rtf/rtflib/exceptions/package.html rename to src/java/org/apache/fop/render/rtf/rtflib/exceptions/package.html index cc91506e8..da0564ad2 100644 --- a/src/java/org/apache/fop/rtf/rtflib/exceptions/package.html +++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/package.html @@ -1,5 +1,5 @@ -org.apache.fop.rtf.rtflib.exceptions +org.apache.fop.render.rtf.rtflib.exceptions

Classes handling specialized exceptions that arise during RTF creation.

diff --git a/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java b/src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java rename to src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java index fae07d339..f1ab9d7a8 100644 --- a/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.interfaces; +package org.apache.fop.render.rtf.rtflib.interfaces; /** Used to get information about tables, for example when handling nested tables * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/interfaces/package.html b/src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html similarity index 51% rename from src/java/org/apache/fop/rtf/rtflib/interfaces/package.html rename to src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html index dce8dd0c9..3403d00ad 100644 --- a/src/java/org/apache/fop/rtf/rtflib/interfaces/package.html +++ b/src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html @@ -1,5 +1,5 @@ -org.apache.fop.rtf.rtflib.interfaces +org.apache.fop.render.rtf.rtflib.interfaces

Interfaces used to build RTF documents.

diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java index 004467668..d29d1b480 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/BorderAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** Constants for RTF border attribute names, and a static method for converting * fo attribute strings. */ diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java index 92a530fd4..326e65e60 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfAfterContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java index a67292cc8..362a12209 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java index 0d17a50cd..e7516a3ab --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java index 6f71ddb87..8770c8a48 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java index d2393e8b4..8a5b8cbab --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java index a6b1fd5fe..42940f02b 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java index b76dcb702..09b6ca34b --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfListContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java index 3d2e631c5..11a0bef35 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfOptions.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** * Options for configuring the rtf elements. diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java index 95a2883db..35464b1f4 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java index e99b2b43d..3fc50e320 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java index 078bf2c34..38d442ee1 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java index fe634e660..45a0bc61a 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java index 9db4c7f59..1d67670fb --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java index 29a038c73..5e716ecd2 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java old mode 100755 new mode 100644 similarity index 97% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java index b9e0fc76e..77beecc63 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java @@ -56,10 +56,10 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** * Interface for RtfElements that can contain RtfTables diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java index 57271b74f..254fe7dc3 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java similarity index 94% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java index f8d115980..93cae8e2c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java @@ -54,7 +54,7 @@ */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; @@ -62,8 +62,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Iterator; import java.io.IOException; -import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTextrun; +import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTextrun; /** Interface which enables an implementing class to contain linear text runs. * @author Peter Herweg, pherweg@web.de diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java index 6314e303a..e85afc511 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ITableAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** * Constants for RTF table attribute names diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java index c97a525ab..dc2f945b1 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java index b08981253..8b0e10c07 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** * diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java index f1fc0965f..1d2b90ca8 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java index 14d20e9ae..dd0c153cf 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java @@ -56,11 +56,11 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** Common code for RtfAfter and RtfBefore * @author Andreas Lambert diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java index c48e2e5fe..351da81e0 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.HashMap; import java.util.Iterator; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java index a70442936..97ba666d1 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBefore.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java index bea4969cc..effa5c888 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmark.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java index 5d16045d5..face2ce09 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java index d8e64dce0..1297ba11c --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfColorTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Vector; import java.util.Hashtable; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java index c6fd4b9d5..317ba6769 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java @@ -56,14 +56,14 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.util.LinkedList; import java.util.List; import java.util.Iterator; import java.io.IOException; -import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException; +import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException; /** An RtfElement that can contain other elements. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java index 75683925b..9558b8cb6 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfDocumentArea.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java index 15b4188e2..7147648a8 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java @@ -56,12 +56,12 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; import java.util.Iterator; -//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; +//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo; /** Base class for all elements of an RTF file. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java index 80ac7d053..76a6bc663 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java @@ -56,12 +56,12 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; -import org.apache.fop.rtf.rtflib.tools.ImageConstants; -import org.apache.fop.rtf.rtflib.tools.ImageUtil; -//import org.apache.fop.rtf.rtflib.tools.jpeg.Encoder; -//import org.apache.fop.rtf.rtflib.tools.jpeg.JPEGException; +import org.apache.fop.render.rtf.rtflib.tools.ImageConstants; +import org.apache.fop.render.rtf.rtflib.tools.ImageUtil; +//import org.apache.fop.render.rtf.rtflib.tools.jpeg.Encoder; +//import org.apache.fop.render.rtf.rtflib.tools.jpeg.JPEGException; import java.io.BufferedInputStream; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java index fbe36ac42..ed48363ad --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; @@ -64,7 +64,7 @@ import java.util.List; import java.util.LinkedList; import java.util.Iterator; import java.util.Collections; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java index bb0a0c855..f05f56b99 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java @@ -56,9 +56,9 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; -import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException; +import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException; import java.io.Writer; import java.io.IOException; import java.io.BufferedWriter; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java index e17f219c6..6b4e13cde 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontManager.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.util.Hashtable; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java index b861ebdf2..2674aa9e8 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFontTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java old mode 100755 new mode 100644 similarity index 97% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java index 1a16f47e9..7051b195a --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java @@ -56,14 +56,14 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Map; import java.util.HashMap; import java.util.Iterator; import java.io.Writer; import java.io.IOException; -//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; +//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo; /** RTF file header, contains style, font and other document-level information. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java index 028c5983e..f1862ed3f --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHyperLink.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java index eff8f9c6c..09d4a9360 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfJforCmd.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java index 35c7b697f..b98400ca5 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfLineBreak.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java index d4ecb0def..879e8ec70 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfList.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java index fc590879c..3ddad1922 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListItem.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java index f1acd7156..d8152610d 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java @@ -56,13 +56,13 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Date; import java.util.Random; import java.io.Writer; import java.io.IOException; -//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; +//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo; /** * RtfListTable: used to make the list table in the header section of the RtfFile. diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java index 1f85c48f8..1a88bcec7 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfNull.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java index 1e522aa97..98fe93cf7 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfOptions.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** * Simplistic options definitions for RTF generation diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java index 0bbcb4681..1d2a3a325 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPage.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java index 3d88ec846..da4523423 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageArea.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java index e3515ecea..9586a2db8 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageBreak.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java index 0355cddaf..e2cdeb82b 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumber.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java index 257009688..66a8a07c2 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java index 9149a27ee..789199150 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraph.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java index 40317a71d..da7c67697 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java index d6a254136..d00aa38b4 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java @@ -56,11 +56,11 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** Models a section in an RTF document * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfString.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfString.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java index 7bb3837bf..8ef95fe0c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfString.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java @@ -55,7 +55,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java index b32cf9a16..678d97402 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStringConverter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Map; import java.util.HashMap; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java index dec5a3643..344c0d80d 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Vector; import java.util.Hashtable; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java old mode 100755 new mode 100644 similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java index a874dc21a..5d6bda9ee --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java @@ -56,11 +56,11 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** Container for RtfRow elements * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java index 87098e4b5..f84b5c970 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java @@ -56,12 +56,12 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; import java.util.Iterator; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** A cell in an RTF table, container for paragraphs, lists, etc. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java index 81dc8cf52..5be8d50f0 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableRow.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java index d614aaa17..811cbe12c 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java index c1179134a..484024374 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTextrun.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java similarity index 98% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTextrun.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java index bc6843cbf..32910ca1a 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTextrun.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java @@ -54,7 +54,7 @@ */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; import java.io.Writer; @@ -62,7 +62,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Iterator; import java.io.IOException; -import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException; +import org.apache.fop.render.rtf.rtflib.exceptions.RtfStructureException; /** Class which contains a linear text run. It has methods to add attributes, text, paragraph breaks.... * @author Peter Herweg, pherweg@web.de diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java index 438612594..98f1bed80 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/WhitespaceCollapser.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.rtfdoc; +package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.util.Iterator; import java.util.StringTokenizer; diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/package.html b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/package.html similarity index 65% rename from src/java/org/apache/fop/rtf/rtflib/rtfdoc/package.html rename to src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/package.html index 55f3ce488..1d8c8db97 100644 --- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/package.html +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/package.html @@ -1,5 +1,5 @@ -org.apache.fop.rtf.rtflib.rtfdoc +org.apache.fop.render.rtf.rtflib.rtfdoc

Independent subsystem (not specific to FOP) classes that are used to build RTF documents.

diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java old mode 100755 new mode 100644 similarity index 93% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java index 8a7553d29..cada79a40 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java @@ -56,12 +56,12 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfHyperLink; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfHyperLink; import java.io.IOException; diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java old mode 100755 new mode 100644 similarity index 97% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java index f179b6af4..c98ce3f51 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java @@ -56,11 +56,11 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.File; import java.io.IOException; -//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; +//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo; /** Create test RTF documents from classes found in this package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java similarity index 96% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java index 9a62c34ac..a48df9d46 100644 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java @@ -56,9 +56,9 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; -import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo; +import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** ITableColumnsInfo that does nothing, used in testodcs package * to create documents without worrying about nested tables handling. diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java old mode 100755 new mode 100644 similarity index 94% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java index 6b95c156e..66bbc9bad --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ExternalGraphic.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java @@ -56,12 +56,12 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfExternalGraphic; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfExternalGraphic; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; import java.io.IOException; /** diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java old mode 100755 new mode 100644 similarity index 90% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java index 8c3aafeaa..6f7ea1848 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ListInTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java @@ -56,18 +56,18 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfList; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfListItem; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; /** Generates a simple RTF test document for the jfor rtflib package. */ diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java old mode 100755 new mode 100644 similarity index 95% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java index 273d91e3b..8590acc23 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/MergedTableCells.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java @@ -56,15 +56,15 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell; /** Generates an RTF test document containing merged table cells * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java old mode 100755 new mode 100644 similarity index 96% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java index e67d8c494..cbe284149 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/NestedTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java @@ -56,16 +56,16 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell; /** Generates an RTF document to test nested tables with the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java old mode 100755 new mode 100644 similarity index 92% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java index eff92a1b9..a63726ea3 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/ParagraphAlignment.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java @@ -56,13 +56,13 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfText; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; /** Generates a simple RTF test document for the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java old mode 100755 new mode 100644 similarity index 94% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java index 68d9a6a1e..54b8f5a4b --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleDocument.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java @@ -56,13 +56,13 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; /** Generates a simple RTF test document for the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java old mode 100755 new mode 100644 similarity index 93% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java index e1ae51bfe..21361ca14 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleLists.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java @@ -56,15 +56,15 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfList; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfListItem; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; /** Generates a simple RTF test document for the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java old mode 100755 new mode 100644 similarity index 92% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java index e634a5ef6..6c44e1780 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/SimpleTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java @@ -56,15 +56,15 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTable; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableRow; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfTableCell; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell; /** Generates a simple RTF test document for the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java old mode 100755 new mode 100644 similarity index 92% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java index abba5654b..4dca5c360 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java @@ -56,18 +56,18 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.util.Date; import java.io.File; import java.io.IOException; import java.io.FileWriter; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfFile; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -//import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo; /** Base class for generating RTF documents used to test the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java old mode 100755 new mode 100644 similarity index 92% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java index eadc3e919..47bb0e33a --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/TextAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java @@ -56,15 +56,15 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfText; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes; /** Generates a simple RTF test document for the jfor rtflib package. * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java old mode 100755 new mode 100644 similarity index 94% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java index f4a28d3f7..cc2f80fe4 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/Whitespace.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java @@ -56,13 +56,13 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.testdocs; +package org.apache.fop.render.rtf.rtflib.testdocs; import java.io.IOException; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfSection; -import org.apache.fop.rtf.rtflib.rtfdoc.RtfParagraph; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection; +import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph; /** Generates an RTF document to test the WhitespaceCollapser * @author Bertrand Delacretaz bdelacretaz@codeconsult.ch diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/package.html b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/package.html similarity index 64% rename from src/java/org/apache/fop/rtf/rtflib/testdocs/package.html rename to src/java/org/apache/fop/render/rtf/rtflib/testdocs/package.html index ef260215c..6d6d62fdf 100644 --- a/src/java/org/apache/fop/rtf/rtflib/testdocs/package.html +++ b/src/java/org/apache/fop/render/rtf/rtflib/testdocs/package.html @@ -1,5 +1,5 @@ -org.apache.fop.rtf.rtflib.testdocs +org.apache.fop.render.rtf.rtflib.testdocs

Classes used to test/demonstrate RTFLib capabilities by generating sample RTF documents.

diff --git a/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java rename to src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java index 036fdc942..3fe38e27e --- a/src/java/org/apache/fop/rtf/rtflib/tools/ImageConstants.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.tools; +package org.apache.fop.render.rtf.rtflib.tools; import java.util.Hashtable; diff --git a/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java old mode 100755 new mode 100644 similarity index 99% rename from src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java rename to src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java index 8da089fbd..a762083db --- a/src/java/org/apache/fop/rtf/rtflib/tools/ImageUtil.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java @@ -56,7 +56,7 @@ * the FOP project. */ -package org.apache.fop.rtf.rtflib.tools; +package org.apache.fop.render.rtf.rtflib.tools; /** Misc.utilities for images handling * This class belongs to the tag processing. diff --git a/src/java/org/apache/fop/rtf/rtflib/tools/package.html b/src/java/org/apache/fop/render/rtf/rtflib/tools/package.html similarity index 54% rename from src/java/org/apache/fop/rtf/rtflib/tools/package.html rename to src/java/org/apache/fop/render/rtf/rtflib/tools/package.html index d53e21bcc..1a0347b9b 100644 --- a/src/java/org/apache/fop/rtf/rtflib/tools/package.html +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/package.html @@ -1,5 +1,5 @@ -org.apache.fop.rtf.rtflib.tools +org.apache.fop.render.rtf.rtflib.tools

Utility classes used in RTF file generation.

diff --git a/src/java/org/apache/fop/rtf/rtflib/package.html b/src/java/org/apache/fop/rtf/rtflib/package.html deleted file mode 100644 index 6b77e6078..000000000 --- a/src/java/org/apache/fop/rtf/rtflib/package.html +++ /dev/null @@ -1,7 +0,0 @@ - -org.apache.fop.rtf.rtflib - -

Classes used to build RTF documents in a generic way, i.e. they are usable by -systems other than FOP.

- - \ No newline at end of file -- 2.39.5