From 85ccd7c7a8b4a42d9b89da3884fbeb8dd7d5f6ac Mon Sep 17 00:00:00 2001
From: Bertrand Delacretaz <bdelacretaz@apache.org>
Date: Wed, 25 Jun 2003 08:54:25 +0000
Subject: [PATCH] additional jfor packages donated to the FOP project

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196525 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java  | 2 +-
 .../apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java  | 2 +-
 src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java | 2 +-
 .../apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java  | 8 ++++----
 .../org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java  | 2 +-
 src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java    | 2 +-
 src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java  | 2 +-
 .../org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java    | 2 +-
 src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java | 2 +-
 src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java   | 2 +-
 .../org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java    | 2 +-
 .../fop/rtf/rtflib/testdocs/CreateTestDocuments.java      | 2 +-
 .../fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java    | 2 +-
 .../org/apache/fop/rtf/rtflib/testdocs/TestDocument.java  | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java
index 8c2ae9222..40bcb44d1 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfTableContainer.java
@@ -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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
index fa0925ac5..7c8cfcc57 100644
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
@@ -56,7 +56,7 @@ import java.io.Writer;
 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 <andreas.lambert@cronidesoft.com>
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java
index 2ad0378b8..8e2fc6ef5 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfElement.java
@@ -54,7 +54,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 
 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.
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
index ba11ba0aa..9fd7ee93e 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
@@ -56,10 +56,10 @@ import org.apache.fop.rtf.rtflib.rtfdoc.RtfElement;
 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;
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
index 596af8a71..4d081cec6 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
@@ -54,7 +54,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 
 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:
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java
index 397db08b3..d0a1c1df0 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfFile.java
@@ -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.
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java
index 5c99fe670..bda13c1dd 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfHeader.java
@@ -55,7 +55,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java
index 23a392288..fe0c33899 100644
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfListTable.java
@@ -55,7 +55,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 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,
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
index 22d962f49..74308a43b 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfSection.java
@@ -56,7 +56,7 @@ import java.io.Writer;
 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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java
index fad93ad35..b65c7ce18 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTable.java
@@ -55,7 +55,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 
 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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java
index 27e4c2db6..bf8c6b6d0 100755
--- a/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java
+++ b/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTableCell.java
@@ -54,7 +54,7 @@ package org.apache.fop.rtf.rtflib.rtfdoc;
 
 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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java
index 1fa3cdbfb..eadd5e5bc 100755
--- a/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java
+++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java
@@ -54,7 +54,7 @@ package org.apache.fop.rtf.rtflib.testdocs;
 
 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 bdelacretaz@codeconsult.ch
diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
index 03a984d7f..3d7a4bf24 100644
--- a/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
+++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
@@ -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.
diff --git a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java b/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java
index 118e4f426..94193e012 100755
--- a/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java
+++ b/src/java/org/apache/fop/rtf/rtflib/testdocs/TestDocument.java
@@ -55,7 +55,7 @@ package org.apache.fop.rtf.rtflib.testdocs;
 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 bdelacretaz@codeconsult.ch
-- 
2.39.5