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

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 8c2ae9222fc9c8b728c0cebb330597face728580..40bcb44d1e7c5403b3bef503c301a6cfcf7269fc 100755 (executable)
--- 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 fa0925ac5fea41300abbad0569edd591e0e532a6..7c8cfcc573916db1691a1dc575e50c3bea37f2df 100644 (file)
--- 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 2ad0378b8c6d1c616bb040864d533f32eea0be12..8e2fc6ef5b8bccd02b43479912ca639fffd3a628 100755 (executable)
--- 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 ba11ba0aafc41cc8701329f2ca8983f60294c58a..9fd7ee93e9fa4528d5a3ef4872fee3f88f20454d 100755 (executable)
--- 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 596af8a71d237d13b76fb006ebac5b7c7e62bea6..4d081cec67f7138e8109f7a1f50e2e82089ee97c 100755 (executable)
--- 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 397db08b38b58cda2f80a604eba27e3597562f8c..d0a1c1df01128d3ffab0953466c8de6dcf33432f 100755 (executable)
--- 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 5c99fe67075e5262f9e4c37717ca3233d269ad28..bda13c1dd621661707b9a2e47a5d2debb0a084f4 100755 (executable)
--- 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 23a392288e64ba0077bff839462cc1a48f2404d1..fe0c33899f92dcf6e32a7edf2b3bc927696f9b87 100644 (file)
--- 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 22d962f49b4bf2936e19ec07dcbd4c4a8f6d831c..74308a43bb7e2c90f42c40528bff972751ae868d 100755 (executable)
--- 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 fad93ad35f6eefbb1c39f3fee1f6f3dec6063d76..b65c7ce18060420408f1b7eceb7c83fb5d1351a9 100755 (executable)
--- 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 27e4c2db670bc21dcc0630e6c44913828107f761..bf8c6b6d08795d65c6ff3cbc102dca3a22609b03 100755 (executable)
--- 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 1fa3cdbfb302d84b25a3b4300bce8ec3c04620cd..eadd5e5bc9332ffb3b40b76fb70fcad460579b08 100755 (executable)
--- 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 03a984d7f21d572af4c7c8b220265851ee7ce959..3d7a4bf2402d00c7d9a809ea139023147b39fa84 100644 (file)
--- 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 118e4f426808e75d6215a81cc3093c0cfc29cf2c..94193e01201dbe6cc554122878b19abf7fd3fff5 100755 (executable)
--- 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