bdelacretaz 2003/06/25 01:54:26
Modified: src/java/org/apache/fop/rtf/rtflib/rtfdoc
IRtfTableContainer.java RtfAfterBeforeBase.java
RtfElement.java RtfExternalGraphic.java
RtfExtraRowSet.java RtfFile.java RtfHeader.java
RtfListTable.java RtfSection.java RtfTable.java
RtfTableCell.java
src/java/org/apache/fop/rtf/rtflib/testdocs
CreateTestDocuments.java DummyTableColumnsInfo.java
TestDocument.java
Log:
additional jfor packages donated to the FOP project
Revision Changes Path
1.3 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java
Index: IRtfTableContainer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IRtfTableContainer.java 24 Jun 2003 17:47:14 -0000 1.2
+++ IRtfTableContainer.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -53,7 +53,7 @@
package org.apache.fop.rtf.rtflib.rtfdoc;
import java.io.IOException;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** Interface for RtfElements that can contain RtfTables
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.3 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
Index: RtfAfterBeforeBase.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfAfterBeforeBase.java 24 Jun 2003 17:47:14 -0000 1.2
+++ RtfAfterBeforeBase.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -56,7 +56,7 @@
import java.io.*;
import java.util.*;
import java.io.IOException;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** Common code for RtfAfter and RtfBefore
* @author Andreas Lambert <[EMAIL PROTECTED]>
1.2 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java
Index: RtfElement.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RtfElement.java 20 Jun 2003 16:08:21 -0000 1.1
+++ RtfElement.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -54,7 +54,7 @@
import java.io.*;
import java.util.*;
-import org.jfor.jfor.main.JForVersionInfo;
+import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
import org.xml.sax.Attributes;
/** Base class for all elements of an RTF file.
1.2 +5 -5
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
Index: RtfExternalGraphic.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RtfExternalGraphic.java 20 Jun 2003 16:08:21 -0000 1.1
+++ RtfExternalGraphic.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -56,10 +56,10 @@
import org.apache.fop.rtf.rtflib.rtfdoc.RtfContainer;
import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
-import org.jfor.jfor.tools.ImageConstants;
-import org.jfor.jfor.tools.ImageUtil;
-import org.jfor.jfor.tools.jpeg.Encoder;
-import org.jfor.jfor.tools.jpeg.JPEGException;
+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 java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
1.3 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
Index: RtfExtraRowSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfExtraRowSet.java 24 Jun 2003 17:47:14 -0000 1.2
+++ RtfExtraRowSet.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -54,7 +54,7 @@
import java.io.*;
import java.util.*;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** Used to add extra table rows after a row that contains a nested table:
1.2 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java
Index: RtfFile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RtfFile.java 20 Jun 2003 16:08:21 -0000 1.1
+++ RtfFile.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -53,7 +53,7 @@
package org.apache.fop.rtf.rtflib.rtfdoc;
import org.apache.fop.rtf.rtflib.exceptions.RtfStructureException;
-import org.jfor.jfor.converter.ConverterLogChannel;
+import org.apache.fop.rtf.rtflib.jfor.converter.ConverterLogChannel;
import java.io.*;
/** Models the top-level structure of an RTF file.
1.2 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java
Index: RtfHeader.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RtfHeader.java 20 Jun 2003 16:08:22 -0000 1.1
+++ RtfHeader.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.*;
import java.io.Writer;
import java.io.IOException;
-import org.jfor.jfor.main.JForVersionInfo;
+import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
/** RTF file header, contains style, font and other document-level information.
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.2 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java
Index: RtfListTable.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RtfListTable.java 20 Jun 2003 16:08:22 -0000 1.1
+++ RtfListTable.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.*;
import java.io.Writer;
import java.io.IOException;
-import org.jfor.jfor.main.JForVersionInfo;
+import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
/**RtfListTable: used to make the list table in the header section of the RtfFile.
* This is the method that Word uses to make lists in RTF and the way most RTF
readers,
1.3 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
Index: RtfSection.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfSection.java 24 Jun 2003 17:47:14 -0000 1.2
+++ RtfSection.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -56,7 +56,7 @@
import java.io.*;
import java.util.*;
import java.io.IOException;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** Models a section in an RTF document
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.3 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java
Index: RtfTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfTable.java 24 Jun 2003 17:47:14 -0000 1.2
+++ RtfTable.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -55,7 +55,7 @@
import java.io.*;
import java.util.Iterator;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** Container for RtfRow elements
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.3 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java
Index: RtfTableCell.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RtfTableCell.java 24 Jun 2003 17:47:14 -0000 1.2
+++ RtfTableCell.java 25 Jun 2003 08:54:25 -0000 1.3
@@ -54,7 +54,7 @@
import java.io.*;
import java.util.*;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** A cell in an RTF table, container for paragraphs, lists, etc.
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.2 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java
Index: CreateTestDocuments.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CreateTestDocuments.java 20 Jun 2003 16:08:27 -0000 1.1
+++ CreateTestDocuments.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -54,7 +54,7 @@
import java.io.File;
import java.io.IOException;
-import org.jfor.jfor.main.JForVersionInfo;
+import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
/** Create test RTF documents from classes found in this package.
* @author Bertrand Delacretaz [EMAIL PROTECTED]
1.2 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
Index: DummyTableColumnsInfo.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyTableColumnsInfo.java 20 Jun 2003 16:08:27 -0000 1.1
+++ DummyTableColumnsInfo.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -52,7 +52,7 @@
*/
package org.apache.fop.rtf.rtflib.testdocs;
-import org.jfor.jfor.interfaces.ITableColumnsInfo;
+import org.apache.fop.rtf.rtflib.interfaces.ITableColumnsInfo;
/** ITableColumnsInfo that does nothing, used in testodcs package
* to create documents without worrying about nested tables handling.
1.2 +2 -2
xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java
Index: TestDocument.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDocument.java 20 Jun 2003 16:08:27 -0000 1.1
+++ TestDocument.java 25 Jun 2003 08:54:25 -0000 1.2
@@ -55,7 +55,7 @@
import java.util.Date;
import java.io.*;
import org.apache.fop.rtf.rtflib.rtfdoc.*;
-import org.jfor.jfor.main.JForVersionInfo;
+import org.apache.fop.rtf.rtflib.jfor.main.JForVersionInfo;
/** Base class for generating RTF documents used to test the jfor rtflib package.
* @author Bertrand Delacretaz [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
