diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-08-05 19:14:10 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-08-05 19:14:10 +0000 |
| commit | 1864420c5febd00c307144fc7c44f3e211fb3cd7 (patch) | |
| tree | e4fb6dc99ebe2d3b62750e127cbee2c3598f99fd /src/java | |
| parent | cab949ae4b52dd9fd22c1f0430abe1f82e538335 (diff) | |
| download | xmlgraphics-fop-1864420c5febd00c307144fc7c44f3e211fb3cd7.tar.gz xmlgraphics-fop-1864420c5febd00c307144fc7c44f3e211fb3cd7.zip | |
Bugzilla #35998
Context classes into the tools package.
Lonely interface ITableColumnsInfo to the others.
Suggested by: Guillaume Déflache <guillaume.at.anyware-tech.com>
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@230499 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
11 files changed, 15 insertions, 24 deletions
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 06e02f9ff..86b8487dd 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -82,6 +82,8 @@ 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.apache.fop.render.rtf.rtflib.tools.BuilderContext; +import org.apache.fop.render.rtf.rtflib.tools.TableContext; import org.apache.fop.fonts.FontSetup; /** diff --git a/src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html b/src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html deleted file mode 100644 index 3403d00ad..000000000 --- a/src/java/org/apache/fop/render/rtf/rtflib/interfaces/package.html +++ /dev/null @@ -1,6 +0,0 @@ -<HTML> -<TITLE>org.apache.fop.render.rtf.rtflib.interfaces</TITLE> -<BODY> -<P>Interfaces used to build RTF documents.</P> -</BODY> -</HTML>
\ No newline at end of file diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java index 9e153aea0..a9dac056c 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.IOException; -import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** * Interface for RtfElements that can contain RtfTables diff --git a/src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java index 92da999b7..1f0f2c400 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/interfaces/ITableColumnsInfo.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ * the FOP project. */ -package org.apache.fop.render.rtf.rtflib.interfaces; +package org.apache.fop.render.rtf.rtflib.rtfdoc; /** 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/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java index 7e7c32b7a..c91125bd4 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** Common code for RtfAfter and RtfBefore * @author Andreas Lambert <andreas.lambert@cronidesoft.com> diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java index af227e486..07090cfb3 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ import java.util.List; import java.util.LinkedList; import java.util.Iterator; import java.util.Collections; -import org.apache.fop.render.rtf.rtflib.interfaces.ITableColumnsInfo; /** diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java index 833a41ca1..b46d42703 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -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/render/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java index 8cb39bf86..e376ff5a3 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; -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/render/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java index d772605ea..bf763133f 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java @@ -29,7 +29,6 @@ package org.apache.fop.render.rtf.rtflib.rtfdoc; import java.io.Writer; import java.io.IOException; import java.util.Iterator; -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/render/rtf/BuilderContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java index d9b73f022..257d4a506 100644 --- a/src/java/org/apache/fop/render/rtf/BuilderContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java @@ -14,11 +14,12 @@ * limitations under the License. */ -/* $Id$ */ +/* $Id: BuilderContext.java 227252 2005-08-03 19:30:55Z jeremias $ */ -package org.apache.fop.render.rtf; +package org.apache.fop.render.rtf.rtflib.tools; import java.util.Stack; + import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfOptions; import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfContainer; diff --git a/src/java/org/apache/fop/render/rtf/TableContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java index 8ae98a922..c97d02209 100644 --- a/src/java/org/apache/fop/render/rtf/TableContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java @@ -14,16 +14,16 @@ * limitations under the License. */ -/* $Id$ */ +/* $Id: TableContext.java 227252 2005-08-03 19:30:55Z jeremias $ */ -package org.apache.fop.render.rtf; +package org.apache.fop.render.rtf.rtflib.tools; import java.util.List; import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.logging.Log; +import org.apache.fop.render.rtf.rtflib.rtfdoc.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. |