Eclipse checkout. Applied Organize Imports. Fixed instances where

static is referred to through an instatiated object rather then
the class.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@196497 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
new file mode 100644 (file)
index 0000000..fe49e4d
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="lib" path="lib/ant-1.5.1.jar"/>
+    <classpathentry kind="lib" path="lib/xalan-2.4.1.jar"/>
+    <classpathentry kind="lib" path="lib/xercesImpl-2.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/xml-apis.jar"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="output" path="build/classes"/>
+</classpath>

diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..d22aa0d
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>fop-alt.design</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>

diff --git a/src/org/apache/fop/apps/Driver.java b/src/org/apache/fop/apps/Driver.java
index 3cd4842c5167e448fec77deaa416218af36b0a6a..6706eaaf0f5f315fcd27f8e87614d71bba86268c 100644 (file)
--- a/src/org/apache/fop/apps/Driver.java
+++ b/src/org/apache/fop/apps/Driver.java
@@ -53,25 +53,16 @@
 package org.apache.fop.apps;
 
 // FOP
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+import org.apache.fop.configuration.Configuration;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.layout.AreaTree;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLSerialHandler;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.configuration.Configuration;
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.expr.PropertyException;
-
-// DOM
-
-// SAX
-import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-// Java
-import java.io.*;
-import java.util.*;
 
 public class Driver {
     /**

diff --git a/src/org/apache/fop/apps/FOInputHandler.java b/src/org/apache/fop/apps/FOInputHandler.java
index f535813b2692589823dc31314b1349002dea969a..3d52b34d26e3f7cc990e3f6caaa8f7a6927a4b8a 100644 (file)
--- a/src/org/apache/fop/apps/FOInputHandler.java
+++ b/src/org/apache/fop/apps/FOInputHandler.java
@@ -53,15 +53,11 @@
 package org.apache.fop.apps;
 
 // Imported SAX classes
+import java.io.File;
+
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-// fop
-import org.apache.fop.messaging.MessageHandler;
-
-// java
-import java.io.File;
-
 /**
  * Manages input if it is an xsl:fo file
  */

diff --git a/src/org/apache/fop/apps/InputHandler.java b/src/org/apache/fop/apps/InputHandler.java
index 24bd0b8876b84315f62a3c420fbb840298bb2ff9..7dfe138cfae674457e30496ef48dc0aeb1eee22f 100644 (file)
--- a/src/org/apache/fop/apps/InputHandler.java
+++ b/src/org/apache/fop/apps/InputHandler.java
@@ -53,16 +53,13 @@
 package org.apache.fop.apps;
 
 // SAX
+import java.io.File;
+import java.net.URL;
+
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-// Java
-import java.net.URL;
-import java.io.File;
-
-// FOP
 import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.configuration.Configuration;
 
 
 abstract public class InputHandler {

diff --git a/src/org/apache/fop/configuration/ConfigurationReader.java b/src/org/apache/fop/configuration/ConfigurationReader.java
index bcb2471d1c8a30b09336d13f2633b580d70cbb29..f02c6205e52bab16a0944ec29ae4e01874c39861 100644 (file)
--- a/src/org/apache/fop/configuration/ConfigurationReader.java
+++ b/src/org/apache/fop/configuration/ConfigurationReader.java
@@ -52,8 +52,6 @@
 
 package org.apache.fop.configuration;
 
-// sax
-import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.XMLReader;
 import org.xml.sax.SAXException;
 import java.io.IOException;
@@ -63,7 +61,6 @@ import org.xml.sax.InputSource;
 import org.apache.fop.apps.Driver;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.configuration.Configuration;
 
 /**
  * entry class for reading configuration from file and creating a configuration

diff --git a/src/org/apache/fop/configuration/LanguageFileReader.java b/src/org/apache/fop/configuration/LanguageFileReader.java
index e855dc768fdb72b87562e117f7767847ffb0eb47..8dd23d939f6a2bdb9a50258b37f4ff5515356709 100644 (file)
--- a/src/org/apache/fop/configuration/LanguageFileReader.java
+++ b/src/org/apache/fop/configuration/LanguageFileReader.java
@@ -68,7 +68,6 @@ import org.apache.fop.configuration.ConfigurationReader;
 import java.io.IOException;
 
 import java.util.HashMap;
-import java.util.ArrayList;
 
 /**
  */

diff --git a/src/org/apache/fop/datastructs/CircularBuffer.java b/src/org/apache/fop/datastructs/CircularBuffer.java
index 6a952a06f26d09c63fccfe9be7697cf29267d30d..c33af0dcabc5fcf3df4c783d03125e9ead19f481 100644 (file)
--- a/src/org/apache/fop/datastructs/CircularBuffer.java
+++ b/src/org/apache/fop/datastructs/CircularBuffer.java
@@ -58,7 +58,6 @@
 package org.apache.fop.datastructs;
 
 import java.util.NoSuchElementException;
-import java.lang.IndexOutOfBoundsException;
 
 /**
  * A general circular buffer class.  It stores and returns <tt>Object</tt>

diff --git a/src/org/apache/fop/datatypes/AbstractPropertyValue.java b/src/org/apache/fop/datatypes/AbstractPropertyValue.java
index d4a31a9f5600014a7aa813181b0bcc9a8efb1f14..5146d1df850774c4628e6e8381c4ee5abdefcc72 100644 (file)
--- a/src/org/apache/fop/datatypes/AbstractPropertyValue.java
+++ b/src/org/apache/fop/datatypes/AbstractPropertyValue.java
@@ -55,12 +55,10 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Base abstract class for all property value types.

diff --git a/src/org/apache/fop/datatypes/Angle.java b/src/org/apache/fop/datatypes/Angle.java
index 3071b58b4e3779321a04d94d4266916ed53d6cdc..d7b2866f57c78757d61ae6aeb16cad1f641a4544 100644 (file)
--- a/src/org/apache/fop/datatypes/Angle.java
+++ b/src/org/apache/fop/datatypes/Angle.java
@@ -53,9 +53,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 
 public class Angle extends AbstractPropertyValue {

diff --git a/src/org/apache/fop/datatypes/Auto.java b/src/org/apache/fop/datatypes/Auto.java
index 6d9eac129a44a3eed66974d7381d6a7f9e922af1..02445e62071221a0e2dbf595a6f268033ff9388d 100644 (file)
--- a/src/org/apache/fop/datatypes/Auto.java
+++ b/src/org/apache/fop/datatypes/Auto.java
@@ -56,10 +56,8 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class for "auto" objects.

diff --git a/src/org/apache/fop/datatypes/Bool.java b/src/org/apache/fop/datatypes/Bool.java
index 3664696337a142613c503d7fb0ff5d878cba2efa..61dda976f26b9c4fe496dc7afa8403ce015d304e 100644 (file)
--- a/src/org/apache/fop/datatypes/Bool.java
+++ b/src/org/apache/fop/datatypes/Bool.java
@@ -56,9 +56,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Boolean property value.  May take values of "true" or "false".

diff --git a/src/org/apache/fop/datatypes/ColorSpace.java b/src/org/apache/fop/datatypes/ColorSpace.java
index e6dc7bbe9ea732322d6d1ddffd6883a3ba0f0269..7395f3c825011c9fabee1ab8e2304d97df807678 100644 (file)
--- a/src/org/apache/fop/datatypes/ColorSpace.java
+++ b/src/org/apache/fop/datatypes/ColorSpace.java
@@ -126,11 +126,11 @@ public class ColorSpace {
 
         // shouldn't this be a select-case? I can never remember
         // the syntax for that.
-        if (this.currentColorSpace == this.DEVICE_RGB) {
+        if (this.currentColorSpace == ColorSpace.DEVICE_RGB) {
             return ("DeviceRGB");
-        } else if (this.currentColorSpace == this.DEVICE_CMYK) {
+        } else if (this.currentColorSpace == ColorSpace.DEVICE_CMYK) {
             return ("DeviceCMYK");
-        } else if (this.currentColorSpace == this.DEVICE_GRAY) {
+        } else if (this.currentColorSpace == ColorSpace.DEVICE_GRAY) {
             return ("DeviceGray");
         } else {    // unknown... Error. Tell them it's RGB and hope they don't notice.
             return ("DeviceRGB");

diff --git a/src/org/apache/fop/datatypes/ColorType.java b/src/org/apache/fop/datatypes/ColorType.java
index f1b8f2de91a80e6319df1e9100069196d7de6314..a82a23a2b4f03535a347e660feef5ef91fe832ef 100644 (file)
--- a/src/org/apache/fop/datatypes/ColorType.java
+++ b/src/org/apache/fop/datatypes/ColorType.java
@@ -54,11 +54,8 @@ package org.apache.fop.datatypes;
 
 import java.util.HashMap;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * A base datatype class; colour in XSL

diff --git a/src/org/apache/fop/datatypes/CountryType.java b/src/org/apache/fop/datatypes/CountryType.java
index 73144504fc854b843898bd0216ccdd45536efb7f..f683905144095efc998ba3d156d773e62407735e 100644 (file)
--- a/src/org/apache/fop/datatypes/CountryType.java
+++ b/src/org/apache/fop/datatypes/CountryType.java
@@ -53,11 +53,9 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A class for <tt>country</tt> specifiers. 

diff --git a/src/org/apache/fop/datatypes/Ems.java b/src/org/apache/fop/datatypes/Ems.java
index 981c34f71cedd3a7c07b348ac647f91478a97d04..735b92bc5ec30a4c8a4e4bd2a3e6177c1cabf2d8 100644 (file)
--- a/src/org/apache/fop/datatypes/Ems.java
+++ b/src/org/apache/fop/datatypes/Ems.java
@@ -54,10 +54,10 @@
 
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * Constructor class for relative lengths measured in <i>ems</i>.  Constructs

diff --git a/src/org/apache/fop/datatypes/EnumType.java b/src/org/apache/fop/datatypes/EnumType.java
index fb1f9addf82695119f635f66de30179abdfbb0d4..31ad9c513e06351f1348f50a36af0e5f90617995 100644 (file)
--- a/src/org/apache/fop/datatypes/EnumType.java
+++ b/src/org/apache/fop/datatypes/EnumType.java
@@ -54,13 +54,9 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.AbstractPropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Base class for representing enumerated values.  The value is maintained as

diff --git a/src/org/apache/fop/datatypes/FontFamilySet.java b/src/org/apache/fop/datatypes/FontFamilySet.java
index 167f1c5a617080eebc878f87dfe893da326a89db..f331b71ab1c1771301b899cd7efede6bbc852c5d 100644 (file)
--- a/src/org/apache/fop/datatypes/FontFamilySet.java
+++ b/src/org/apache/fop/datatypes/FontFamilySet.java
@@ -60,12 +60,9 @@ package org.apache.fop.datatypes;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A base class for representing a set of font family names.

diff --git a/src/org/apache/fop/datatypes/Frequency.java b/src/org/apache/fop/datatypes/Frequency.java
index eba58a1d79f9af6a033ba991e9b64923b3958ea3..172619ca7de2b48be6d3a407ba4139640f26dffd 100644 (file)
--- a/src/org/apache/fop/datatypes/Frequency.java
+++ b/src/org/apache/fop/datatypes/Frequency.java
@@ -53,9 +53,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 
 public class Frequency extends AbstractPropertyValue {

diff --git a/src/org/apache/fop/datatypes/IntegerType.java b/src/org/apache/fop/datatypes/IntegerType.java
index 03a15c09b0d119bdc4ee1ff9c68147d5a5445b28..bcbd11ecf52c9c1519526de813d2e4c8eb2f9144 100644 (file)
--- a/src/org/apache/fop/datatypes/IntegerType.java
+++ b/src/org/apache/fop/datatypes/IntegerType.java
@@ -56,9 +56,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 
 public class IntegerType extends AbstractPropertyValue {

diff --git a/src/org/apache/fop/datatypes/Ints.java b/src/org/apache/fop/datatypes/Ints.java
index 8a2faf4969bf9fff1cfb40fd589a959ee6920b30..7f8557f839d1cdb4341c8ad2927400e1b83e244c 100644 (file)
--- a/src/org/apache/fop/datatypes/Ints.java
+++ b/src/org/apache/fop/datatypes/Ints.java
@@ -57,9 +57,9 @@
 
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.datastructs.ROIntegerArray;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 
 /**
  * Data class of pre-initialised Integer objects.

diff --git a/src/org/apache/fop/datatypes/LanguageType.java b/src/org/apache/fop/datatypes/LanguageType.java
index 6cd7ca7d956fb05b7cd64bee91ad3ed74800f8c5..29dafca759286978f59587f4876338c35f84d735 100644 (file)
--- a/src/org/apache/fop/datatypes/LanguageType.java
+++ b/src/org/apache/fop/datatypes/LanguageType.java
@@ -57,11 +57,9 @@
 
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A class for <tt>language</tt> specifiers.

diff --git a/src/org/apache/fop/datatypes/Literal.java b/src/org/apache/fop/datatypes/Literal.java
index 8db1a0dfca1a9929d85acfd865759a946206d5ee..1d5f35e8d99c6c5081096f776bba85ab1ab93fbc 100644 (file)
--- a/src/org/apache/fop/datatypes/Literal.java
+++ b/src/org/apache/fop/datatypes/Literal.java
@@ -56,11 +56,9 @@
 
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class to represent Literal values.  Subclass of <tt>StringType</tt>.

diff --git a/src/org/apache/fop/datatypes/MappedNumeric.java b/src/org/apache/fop/datatypes/MappedNumeric.java
index d66e2d2be4793b663bee03d85d29cfbc34b5144b..da47cba93a40bede27904e443cf3f83a83ae079d 100644 (file)
--- a/src/org/apache/fop/datatypes/MappedNumeric.java
+++ b/src/org/apache/fop/datatypes/MappedNumeric.java
@@ -55,12 +55,9 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class to represent an enumerated type whose values map onto a

diff --git a/src/org/apache/fop/datatypes/MimeType.java b/src/org/apache/fop/datatypes/MimeType.java
index 0c62fcd090348cdce431ed63471839e14151fd48..8435dd5c563ba562593f31ea96566c2b32719e40 100644 (file)
--- a/src/org/apache/fop/datatypes/MimeType.java
+++ b/src/org/apache/fop/datatypes/MimeType.java
@@ -57,9 +57,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class for mime-type subset of <tt>content-type</tt>.

diff --git a/src/org/apache/fop/datatypes/NCName.java b/src/org/apache/fop/datatypes/NCName.java
index 509a106c3369e2fab6db2b2fc55a4913d4c1b5ff..291162c1d5fbd9c79ad53ce61056dc9d983cf5a4 100644 (file)
--- a/src/org/apache/fop/datatypes/NCName.java
+++ b/src/org/apache/fop/datatypes/NCName.java
@@ -58,9 +58,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.StringType;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * An NCName.  NCName may be instantiated directly, and it also serves as a

diff --git a/src/org/apache/fop/datatypes/NoType.java b/src/org/apache/fop/datatypes/NoType.java
index 037ecfd34c169380eb70e22bf1a0632a52178beb..55b438f448734f06a117ad9c310a8a9236a310b6 100644 (file)
--- a/src/org/apache/fop/datatypes/NoType.java
+++ b/src/org/apache/fop/datatypes/NoType.java
@@ -56,12 +56,9 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class for dummy property values; e.g. unsupported properties or null

diff --git a/src/org/apache/fop/datatypes/None.java b/src/org/apache/fop/datatypes/None.java
index 0b9fc53138230ef980a2c61e854cfeb80d3a8c9c..4a80d639c70922438ac0e326bf8a2140201769e9 100644 (file)
--- a/src/org/apache/fop/datatypes/None.java
+++ b/src/org/apache/fop/datatypes/None.java
@@ -56,10 +56,8 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class for property values of "none".

diff --git a/src/org/apache/fop/datatypes/Numeric.java b/src/org/apache/fop/datatypes/Numeric.java
index 6a2745e0169eb0c382e36a95bda36b9c8f65c949..151da013cbf035bf40321b1bf168869c2ec21371 100644 (file)
--- a/src/org/apache/fop/datatypes/Numeric.java
+++ b/src/org/apache/fop/datatypes/Numeric.java
@@ -55,14 +55,9 @@
 
 package org.apache.fop.datatypes;
 
-import java.lang.Number;
-
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 
 /**

diff --git a/src/org/apache/fop/datatypes/PropertyValue.java b/src/org/apache/fop/datatypes/PropertyValue.java
index 395232fe75dff24d1d26f9fc731e501d977787a0..a58dd1d821d7d61250276b1a69ed2ddb121f7f22 100644 (file)
--- a/src/org/apache/fop/datatypes/PropertyValue.java
+++ b/src/org/apache/fop/datatypes/PropertyValue.java
@@ -56,9 +56,8 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.FONode;
 import org.apache.fop.datastructs.ROStringArray;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * Base interface for all property value types.

diff --git a/src/org/apache/fop/datatypes/PropertyValueList.java b/src/org/apache/fop/datatypes/PropertyValueList.java
index 8d8a45fa4a8edba072bff327408b74110779a0fb..ffd8d1c43004f76fa3bc361ecb8414696be8e833 100644 (file)
--- a/src/org/apache/fop/datatypes/PropertyValueList.java
+++ b/src/org/apache/fop/datatypes/PropertyValueList.java
@@ -57,17 +57,14 @@
 package org.apache.fop.datatypes;
 
 import java.lang.reflect.InvocationTargetException;
-
-import java.util.LinkedList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedList;
 
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A list of <tt>PropertyValue</tt> elements.

diff --git a/src/org/apache/fop/datatypes/ScriptType.java b/src/org/apache/fop/datatypes/ScriptType.java
index 755dcbedde461ba68c94a92973aecebdb3d1de44..2b5e318a3a6e0994be21a601902a2569cd5b8f35 100644 (file)
--- a/src/org/apache/fop/datatypes/ScriptType.java
+++ b/src/org/apache/fop/datatypes/ScriptType.java
@@ -56,11 +56,9 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A class for <tt>script</tt> specifiers.

diff --git a/src/org/apache/fop/datatypes/ShadowEffect.java b/src/org/apache/fop/datatypes/ShadowEffect.java
index eba90d1114c70a5fc84ed253ac31f08216d9d7a3..f2190bb96862590c6882bcea3711b726eef074a0 100644 (file)
--- a/src/org/apache/fop/datatypes/ShadowEffect.java
+++ b/src/org/apache/fop/datatypes/ShadowEffect.java
@@ -54,16 +54,11 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.PropNames;
-
 import java.util.Iterator;
 
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
+
 /**
  * Class to represent ShadowEffect values.  This class is a holder for a
  * set of PropertyValue objects, and will be placed in a PropertyValueList,

diff --git a/src/org/apache/fop/datatypes/Slash.java b/src/org/apache/fop/datatypes/Slash.java
index 7a5aeaebcc8ff3b77e7c54e87789ebf98ce0af09..0b873be37b2a327b970995850d6ae103aa3eda64 100644 (file)
--- a/src/org/apache/fop/datatypes/Slash.java
+++ b/src/org/apache/fop/datatypes/Slash.java
@@ -55,9 +55,6 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.properties.*;
 
 /**
  * A datatype representing an isolated forward slash character.

diff --git a/src/org/apache/fop/datatypes/StringType.java b/src/org/apache/fop/datatypes/StringType.java
index 760e66396d840589196d4c0475c07793e2b709e6..82dd0ebf585b329306a309f8384faba9d706a586 100644 (file)
--- a/src/org/apache/fop/datatypes/StringType.java
+++ b/src/org/apache/fop/datatypes/StringType.java
@@ -58,9 +58,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * <tt>StringType</tt> is not intended to be instantiated directly. It

diff --git a/src/org/apache/fop/datatypes/TextDecorator.java b/src/org/apache/fop/datatypes/TextDecorator.java
index 995d10a1a47e9b078e5c967ef145175571ac426c..e8b203fbd8f436f867200cb6be6c2e513445e9a3 100644 (file)
--- a/src/org/apache/fop/datatypes/TextDecorator.java
+++ b/src/org/apache/fop/datatypes/TextDecorator.java
@@ -55,11 +55,8 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * Class for "text-decoration" specification.  This class specifies the

diff --git a/src/org/apache/fop/datatypes/Time.java b/src/org/apache/fop/datatypes/Time.java
index 42e2835eee95190749f32c8635cf65846315777f..a74b411284f5e3c463039f6e6c4474a68a1db0d3 100644 (file)
--- a/src/org/apache/fop/datatypes/Time.java
+++ b/src/org/apache/fop/datatypes/Time.java
@@ -55,9 +55,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 
 public class Time extends AbstractPropertyValue {

diff --git a/src/org/apache/fop/datatypes/UriType.java b/src/org/apache/fop/datatypes/UriType.java
index 827fe141999bc5bf7fa1215ebc708d4f9403c3a4..384d7f4fb9f6ff8564c1db080dfef752df0f3c58 100644 (file)
--- a/src/org/apache/fop/datatypes/UriType.java
+++ b/src/org/apache/fop/datatypes/UriType.java
@@ -56,10 +56,8 @@
  */
 package org.apache.fop.datatypes;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class for URLs specified with <tt>uri()</tt> function.

diff --git a/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java b/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java
index 9e7d48782146bb98aa0c2acf82cb7f278f1844c1..b3891872cc1351f033fd08cd3b160c0ece3b32c7 100644 (file)
--- a/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java
+++ b/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.datatypes.indirect;
 
-import org.apache.fop.datatypes.indirect.IndirectValue;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.FONode;
 
 /**
  * A pseudo-class to represent a call to the core function

diff --git a/src/org/apache/fop/datatypes/indirect/FromParent.java b/src/org/apache/fop/datatypes/indirect/FromParent.java
index 2342cae6e28f3f16ad7120f5412ba16ae3b97a6a..8e31396ed4e3a6f9781929b193da4d51dc46d46d 100644 (file)
--- a/src/org/apache/fop/datatypes/indirect/FromParent.java
+++ b/src/org/apache/fop/datatypes/indirect/FromParent.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.datatypes.indirect;
 
-import org.apache.fop.datatypes.indirect.IndirectValue;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.properties.Property;

diff --git a/src/org/apache/fop/datatypes/indirect/IndirectValue.java b/src/org/apache/fop/datatypes/indirect/IndirectValue.java
index 9aa899a970570bd09958e5152293f983778355e8..2efe03c03054832f02f580a7983f09795050c5ad 100644 (file)
--- a/src/org/apache/fop/datatypes/indirect/IndirectValue.java
+++ b/src/org/apache/fop/datatypes/indirect/IndirectValue.java
@@ -54,13 +54,12 @@
  */
 package org.apache.fop.datatypes.indirect;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * A superclass for objects which may have deferred <tt>PropertyValue</tt>

diff --git a/src/org/apache/fop/datatypes/indirect/Inherit.java b/src/org/apache/fop/datatypes/indirect/Inherit.java
index b409d7240d89adee6da5e389add6e2207eb376fc..b00d3e6ad85680560d33e8ac9b30bb8b4aef6669 100644 (file)
--- a/src/org/apache/fop/datatypes/indirect/Inherit.java
+++ b/src/org/apache/fop/datatypes/indirect/Inherit.java
@@ -56,11 +56,9 @@
  */
 package org.apache.fop.datatypes.indirect;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.indirect.IndirectValue;
 
 /**
  * A class representing the <tt>inherit</tt> keyword.  This keyword is

diff --git a/src/org/apache/fop/datatypes/indirect/InheritedValue.java b/src/org/apache/fop/datatypes/indirect/InheritedValue.java
index f85d442cb01afc57828a5bed1c514f37a06dd861..d356f98224349be59e81f43c5600c0bce55d197a 100644 (file)
--- a/src/org/apache/fop/datatypes/indirect/InheritedValue.java
+++ b/src/org/apache/fop/datatypes/indirect/InheritedValue.java
@@ -54,12 +54,10 @@
  */
 package org.apache.fop.datatypes.indirect;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.datatypes.indirect.IndirectValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * A class representing an unresolved inherited value.  It may be created as

diff --git a/src/org/apache/fop/fo/FOAttributes.java b/src/org/apache/fop/fo/FOAttributes.java
index 0cac00db3d98b54baad8b6e17a8366356404876f..52e91cd5f28eeba8287a0f1ff367b3e6fc0dceb0 100644 (file)
--- a/src/org/apache/fop/fo/FOAttributes.java
+++ b/src/org/apache/fop/fo/FOAttributes.java
@@ -57,25 +57,20 @@
  */
 package org.apache.fop.fo;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.xml.sax.Attributes;
+
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXMLEvent;
 import org.apache.fop.xml.XMLNamespaces;
 
-import org.xml.sax.Attributes;
-
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Collections;
-import java.util.Arrays;
-
 /**
  * The FO Attributes data structures and methods needed to manage the
  * Attributes associated with FO nodes.

diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java
index 943f33288987473ce917d9b797d141a51df9166c..143b5c392b79f3fd67374b6f8edac569e443e139 100644 (file)
--- a/src/org/apache/fop/fo/FONode.java
+++ b/src/org/apache/fop/fo/FONode.java
@@ -56,40 +56,28 @@
  */
 package org.apache.fop.fo;
 
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FOPropertySets;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.expr.PropertyParser;
-import org.apache.fop.fo.expr.FunctionNotImplementedException;
-import org.apache.fop.datatypes.Ints;
+import java.util.BitSet;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.Node;
+import org.apache.fop.datastructs.ROBitSet;
+import org.apache.fop.datastructs.TreeException;
+import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.TextDecorations;
-import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.datatypes.indirect.IndirectValue;
-import org.apache.fop.datastructs.Node;
-import org.apache.fop.datastructs.Node.*;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datastructs.ROBitSet;
-import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.expr.FunctionNotImplementedException;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.expr.PropertyParser;
+import org.apache.fop.fo.properties.Property;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
 import org.apache.fop.xml.FoXMLEventPool;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.messaging.MessageHandler;
-
-import org.xml.sax.Attributes;
-
-import java.util.BitSet;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 
 /**
  * Class for nodes in the FO tree.

diff --git a/src/org/apache/fop/fo/FOPropertySets.java b/src/org/apache/fop/fo/FOPropertySets.java
index b8cc2099dc7858c00c3a438cbb1ff5387dc52642..cae648845317cd6c81f57dcfb23417a7197fbbd9 100644 (file)
--- a/src/org/apache/fop/fo/FOPropertySets.java
+++ b/src/org/apache/fop/fo/FOPropertySets.java
@@ -55,23 +55,9 @@
 
 package org.apache.fop.fo;
 
-import java.lang.Character;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-// Only for tree property set partitions
 import java.util.BitSet;
-import java.util.Iterator;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datastructs.ROIntArray;
 import org.apache.fop.datastructs.ROBitSet;
 
 /**

diff --git a/src/org/apache/fop/fo/FOTree.java b/src/org/apache/fop/fo/FOTree.java
index a217da2bdbf82cf0b0015178a5ba74fe5698a6f0..2aa35e44f2028a466094c895a7dedc0347305a9a 100644 (file)
--- a/src/org/apache/fop/fo/FOTree.java
+++ b/src/org/apache/fop/fo/FOTree.java
@@ -56,32 +56,15 @@
  */
 package org.apache.fop.fo;
 
+import org.apache.fop.apps.Driver;
+import org.apache.fop.configuration.Configuration;
 import org.apache.fop.datastructs.Tree;
-import org.apache.fop.datastructs.Node;
-import org.apache.fop.datastructs.Node.*;
-import org.apache.fop.datatypes.Ints;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.CountryLanguageScript;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.configuration.Configuration;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.expr.PropertyParser;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 
 /**
  * <tt>FOTree</tt> is the class that generates and maintains the FO Tree.
@@ -175,7 +158,7 @@ public class FOTree extends Tree implements Runnable {
             foRoot.buildFoTree();
             System.out.println("Back from buildFoTree");
             // Clean up the fo:root event
-            event = xmlevents.getEndElement(xmlevents.DISCARD_EV, event);
+            event = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, event);
             // Get the end of document
             xmlevents.getEndDocument();
         } catch (Exception e) {

diff --git a/src/org/apache/fop/fo/FObject.java b/src/org/apache/fop/fo/FObject.java
index 22d435152f889ea5af17753fc20f23e10d520a12..b93441e65659d34ee245333c49a5c95089218355 100644 (file)
--- a/src/org/apache/fop/fo/FObject.java
+++ b/src/org/apache/fop/fo/FObject.java
@@ -2,15 +2,59 @@
  * FObject.java
  * Created: Sun Jan 27 01:35:24 2002
  *
+ * ============================================================================
+ *                   The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of  source code must  retain the above copyright  notice,
+ *    this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include  the following  acknowledgment:  "This product includes  software
+ *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
+ *    Alternately, this  acknowledgment may  appear in the software itself,  if
+ *    and wherever such third-party acknowledgments normally appear.
+ * 
+ * 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
+ *    endorse  or promote  products derived  from this  software without  prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ * 
+ * 5. Products  derived from this software may not  be called "Apache", nor may
+ *    "Apache" appear  in their name,  without prior written permission  of the
+ *    Apache Software Foundation.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
+ * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
+ * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
+ * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * This software  consists of voluntary contributions made  by many individuals
+ * on  behalf of the Apache Software  Foundation and was  originally created by
+ * James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
+ * Software Foundation, please see <http://www.apache.org/>.
+ *  
  * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  * @version $Revision$ $Name$
  */
 
 package org.apache.fop.fo;
 
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.FObjects;
 
 /**
  * Base class for all Flow Objects

diff --git a/src/org/apache/fop/fo/FObjectNames.java b/src/org/apache/fop/fo/FObjectNames.java
index 74f919a0d3cfab3f26f96489883770bf9959e4e0..cd8b81d43b4cfccedeab2140a399e14b7e4a92aa 100644 (file)
--- a/src/org/apache/fop/fo/FObjectNames.java
+++ b/src/org/apache/fop/fo/FObjectNames.java
@@ -55,11 +55,11 @@
 
 package org.apache.fop.fo;
 
+import java.util.HashMap;
+
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.Ints;
 
-import java.util.HashMap;
-
 /**
  * Data class containing the Flow Object names and associated integer
  * constants.

diff --git a/src/org/apache/fop/fo/FObjectSets.java b/src/org/apache/fop/fo/FObjectSets.java
index 3657d1b16d0d6a91787d5d894946508c579e634b..9ddfb9d88fee9a11b132bab19479e655f744a83d 100644 (file)
--- a/src/org/apache/fop/fo/FObjectSets.java
+++ b/src/org/apache/fop/fo/FObjectSets.java
@@ -55,11 +55,10 @@
 
 package org.apache.fop.fo;
 
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.datastructs.ROBitSet;
-
 import java.util.BitSet;
 
+import org.apache.fop.datastructs.ROBitSet;
+
 /**
  * Data class containing sets of Flow Objects included in certain FO set
  * specifications.

diff --git a/src/org/apache/fop/fo/FObjects.java b/src/org/apache/fop/fo/FObjects.java
index b15689c458a38379f8b82d7ff10500f6c965672d..765fd72ff86b4aaedf385fa2c1b4deae5a7db8fd 100644 (file)
--- a/src/org/apache/fop/fo/FObjects.java
+++ b/src/org/apache/fop/fo/FObjects.java
@@ -55,19 +55,12 @@
 
 package org.apache.fop.fo;
 
-import java.lang.Character;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
-// Only for tree property set partitions
-
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.datatypes.Ints;
 import org.apache.fop.xml.FoXMLEvent;
 

diff --git a/src/org/apache/fop/fo/FoRoot.java b/src/org/apache/fop/fo/FoRoot.java
index df5321536d03f3676374dcd9e89e23d33db74113..a471c6bb02a06e5a3a084fb8c1955e93e648e202 100644 (file)
--- a/src/org/apache/fop/fo/FoRoot.java
+++ b/src/org/apache/fop/fo/FoRoot.java
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * 
  * ============================================================================
@@ -55,26 +55,19 @@
 
 package org.apache.fop.fo;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.NoSuchElementException;
+
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.pagination.FoLayoutMasterSet;
 import org.apache.fop.fo.declarations.FoDeclarations;
+import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.flow.FoPageSequence;
+import org.apache.fop.fo.pagination.FoLayoutMasterSet;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-
-import org.xml.sax.Attributes;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.NoSuchElementException;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * <tt>FoRoot</tt> is the class which processes the fo:root start element
@@ -181,7 +174,7 @@ public class FoRoot extends FONode {
                                 new FoLayoutMasterSet(getFOTree(), this, ev);
             // Clean up the fo:layout-master-set event
             pageSequenceMasters = layoutMasters.getPageSequenceMasters();
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             layoutMasters.deleteSubTree();
 
@@ -193,7 +186,7 @@ public class FoRoot extends FONode {
                 // process the declarations
                 declarations = numChildren();
                 new FoDeclarations(getFOTree(), this, ev);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -206,14 +199,14 @@ public class FoRoot extends FONode {
                 throw new FOPException("No page-sequence found.");
             firstPageSeq = numChildren();
             new FoPageSequence(getFOTree(), this, ev);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             while ((ev = xmlevents.expectStartElement
                     (FObjectNames.PAGE_SEQUENCE, XMLEvent.DISCARD_W_SPACE))
                    != null) {
                 // Loop over remaining fo:page-sequences
                 new FoPageSequence(getFOTree(), this, ev);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/PropNames.java b/src/org/apache/fop/fo/PropNames.java
index 373bd485eda5102104a119a3d99b34e380e74cd1..92098456864c561de2f083f29e8f71ad61561907 100644 (file)
--- a/src/org/apache/fop/fo/PropNames.java
+++ b/src/org/apache/fop/fo/PropNames.java
@@ -56,8 +56,8 @@ package org.apache.fop.fo;
 
 import java.util.HashMap;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * A class of constants; an array of all property names and the constants

diff --git a/src/org/apache/fop/fo/PropertyConsts.java b/src/org/apache/fop/fo/PropertyConsts.java
index bf9a047cfee107089ca94512a4813736975fa9e8..368b8cb198a7f65e96d774542e51634b62316492 100644 (file)
--- a/src/org/apache/fop/fo/PropertyConsts.java
+++ b/src/org/apache/fop/fo/PropertyConsts.java
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * 
  * ============================================================================
@@ -55,30 +55,16 @@
 
 package org.apache.fop.fo;
 
-import java.lang.Character;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.BitSet;
+import java.util.HashMap;
 import java.util.StringTokenizer;
 
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datastructs.ROIntArray;
 import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datastructs.ROBitSet;
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * This class contains a number of arrays containing values indexed by the

diff --git a/src/org/apache/fop/fo/PropertySets.java b/src/org/apache/fop/fo/PropertySets.java
index c1c591b82e9990dfc44ebe0e4273402beb0129dd..19b10da86bd09f0154dabfba397b3c14bdb6f0ed 100644 (file)
--- a/src/org/apache/fop/fo/PropertySets.java
+++ b/src/org/apache/fop/fo/PropertySets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * 
  * ============================================================================
@@ -57,7 +57,6 @@ package org.apache.fop.fo;
 
 import java.util.BitSet;
 
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.datastructs.ROBitSet;
 
 /**

diff --git a/src/org/apache/fop/fo/ReferenceAreaFO.java b/src/org/apache/fop/fo/ReferenceAreaFO.java
index 5030811d359de6e186932333e0afc77c27a98d16..6fa0bef5fed86c33af4af5127f2ed7007d6497eb 100644 (file)
--- a/src/org/apache/fop/fo/ReferenceAreaFO.java
+++ b/src/org/apache/fop/fo/ReferenceAreaFO.java
@@ -54,7 +54,6 @@
  */
 package org.apache.fop.fo;
 
-import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * Base interface for all FOs which are generate reference areas.

diff --git a/src/org/apache/fop/fo/ShorthandPropSets.java b/src/org/apache/fop/fo/ShorthandPropSets.java
index bb1d00377d5e9996880cfa6ea0c1bfec5f034f6a..f357397ee156042b787b6ae0a8d874ab9c829157 100644 (file)
--- a/src/org/apache/fop/fo/ShorthandPropSets.java
+++ b/src/org/apache/fop/fo/ShorthandPropSets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * 
  * ============================================================================
@@ -55,26 +55,17 @@
 
 package org.apache.fop.fo;
 
-import java.lang.CloneNotSupportedException;
-
-import java.util.Set;
 import java.util.BitSet;
-import java.util.HashSet;
 import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
 import java.util.Iterator;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.ListIterator;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.datastructs.ROIntArray;
 import org.apache.fop.datastructs.ROBitSet;
+import org.apache.fop.datastructs.ROIntArray;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.expr.PropertyException;
 
 /**
  * This class contains <tt>ROIntArray</tt>s which encode the various sets of

diff --git a/src/org/apache/fop/fo/declarations/FoColorProfile.java b/src/org/apache/fop/fo/declarations/FoColorProfile.java
index c0ea117abe2378461eea13af69fbaad3e67cc46e..00cec9246c993ac489170c7dafd589165b3a04a0 100644 (file)
--- a/src/org/apache/fop/fo/declarations/FoColorProfile.java
+++ b/src/org/apache/fop/fo/declarations/FoColorProfile.java
@@ -55,20 +55,15 @@
 package org.apache.fop.fo.declarations;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/declarations/FoDeclarations.java b/src/org/apache/fop/fo/declarations/FoDeclarations.java
index a0d6d31b44f7b3ccade6172fb772ee3a9d1c08fd..c8f843a2c1518abb4e3cc1fbaf615549f3416339 100644 (file)
--- a/src/org/apache/fop/fo/declarations/FoDeclarations.java
+++ b/src/org/apache/fop/fo/declarations/FoDeclarations.java
@@ -55,20 +55,18 @@
 package org.apache.fop.fo.declarations;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FOTree;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.datastructs.TreeException;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * <tt>FoLayoutMasterSet</tt> is the class which processes the
@@ -126,7 +124,7 @@ public class FoDeclarations extends FONode {
                 throw new FOPException
                         ("No fo:color-profile in fo:declarations.");
             new FoColorProfile(foTree, this, ev);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             do {
                 ev = xmlevents.expectStartElement
@@ -134,7 +132,7 @@ public class FoDeclarations extends FONode {
                 if (ev == null) break; // No instance of these elements found
                 new FoColorProfile(foTree, this, ev);
                 // Flush the master event
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/expr/PropertyParser.java b/src/org/apache/fop/fo/expr/PropertyParser.java
index b94614bc730cb5df44e9a16de36d371b08220e94..0e43ba6f95e9dc36c18fc61f6a4c895d6c4f58fc 100644 (file)
--- a/src/org/apache/fop/fo/expr/PropertyParser.java
+++ b/src/org/apache/fop/fo/expr/PropertyParser.java
@@ -52,39 +52,35 @@
 
 package org.apache.fop.fo.expr;
 
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.expr.SystemFontFunction;
-
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Literal;
-import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.Percentage;
+import org.apache.fop.datatypes.Angle;
+import org.apache.fop.datatypes.Auto;
+import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Ems;
+import org.apache.fop.datatypes.Frequency;
 import org.apache.fop.datatypes.IntegerType;
 import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.Time;
-import org.apache.fop.datatypes.Frequency;
-import org.apache.fop.datatypes.Angle;
-import org.apache.fop.datatypes.Bool;
-import org.apache.fop.datatypes.Auto;
+import org.apache.fop.datatypes.Literal;
+import org.apache.fop.datatypes.MimeType;
+import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.None;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.Percentage;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.Slash;
-import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.StringType;
-import org.apache.fop.datatypes.MimeType;
+import org.apache.fop.datatypes.Time;
 import org.apache.fop.datatypes.UriType;
+import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.datatypes.indirect.FromParent;
 import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.datatypes.indirect.InheritedValue;
-import org.apache.fop.datatypes.indirect.FromParent;
-import org.apache.fop.datatypes.indirect.FromNearestSpecified;
-
-import java.util.HashMap;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.properties.Property;
 
 /**
  * Class to parse XSL FO property expression.

diff --git a/src/org/apache/fop/fo/expr/PropertyTokenizer.java b/src/org/apache/fop/fo/expr/PropertyTokenizer.java
index cbc4fc63762bcefec207a4ad53a6ddb723d7305a..5c2da1fad9aebfa5f8e1afed4d06f59a752a40ff 100644 (file)
--- a/src/org/apache/fop/fo/expr/PropertyTokenizer.java
+++ b/src/org/apache/fop/fo/expr/PropertyTokenizer.java
@@ -52,9 +52,8 @@
 
 package org.apache.fop.fo.expr;
 
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.Frequency;
+import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.Time;
 
 /**

diff --git a/src/org/apache/fop/fo/expr/SystemFontFunction.java b/src/org/apache/fop/fo/expr/SystemFontFunction.java
index 9f0a046a31aa9c977aa7886a3da5e477f3c4d782..81eaf16e6debffd541dac3b648452fc2e41f8ca4 100644 (file)
--- a/src/org/apache/fop/fo/expr/SystemFontFunction.java
+++ b/src/org/apache/fop/fo/expr/SystemFontFunction.java
@@ -7,14 +7,10 @@
  */
 package org.apache.fop.fo.expr;
 
-import org.apache.fop.fo.properties.Font;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.expr.FunctionNotImplementedException;
 import org.apache.fop.datastructs.ROIntArray;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.ShorthandPropSets;
 
 /**
  * Implement the system font function.

diff --git a/src/org/apache/fop/fo/flow/Dummy.java b/src/org/apache/fop/fo/flow/Dummy.java
index 34a2cf102e1262f650c69204c0f04c18a385d74e..62ce84b8ece9c36e2d2673081700c0bffb879b09 100644 (file)
--- a/src/org/apache/fop/fo/flow/Dummy.java
+++ b/src/org/apache/fop/fo/flow/Dummy.java
@@ -1,5 +1,6 @@
 package org.apache.fop.fo.flow;
 
+
 import org.apache.fop.fo.flow.FoBasicLink;
 import org.apache.fop.fo.flow.FoBidiOverride;
 import org.apache.fop.fo.flow.FoBlockContainer;

diff --git a/src/org/apache/fop/fo/flow/FoBasicLink.java b/src/org/apache/fop/fo/flow/FoBasicLink.java
index de16ea9c1467aba00df18b64af9150f9bb300861..8e8d10a09330bbc0f147529b2d77b3811e4cc73d 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBasicLink.java
+++ b/src/org/apache/fop/fo/flow/FoBasicLink.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:basic-link flow object.
@@ -172,7 +169,7 @@ public class FoBasicLink extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA)
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
@@ -180,7 +177,7 @@ public class FoBasicLink extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoBidiOverride.java b/src/org/apache/fop/fo/flow/FoBidiOverride.java
index ce2df38534bb768f68b5b16c06de3f433772a243..c59c51edb53736b5f215b6b1a47ce3a246c387b9 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBidiOverride.java
+++ b/src/org/apache/fop/fo/flow/FoBidiOverride.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:bidi-override flow object.
@@ -158,7 +155,7 @@ public class FoBidiOverride extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA)
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
@@ -166,7 +163,7 @@ public class FoBidiOverride extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoBlock.java b/src/org/apache/fop/fo/flow/FoBlock.java
index 5552825ff05d6e1e003634b805fbe1004d6d93d8..9720f5d7f2c535331d7b4f5ae0c59265dcbfffdf 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBlock.java
+++ b/src/org/apache/fop/fo/flow/FoBlock.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:block flow object.
@@ -184,7 +181,7 @@ public class FoBlock extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -193,7 +190,7 @@ public class FoBlock extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoBlockContainer.java b/src/org/apache/fop/fo/flow/FoBlockContainer.java
index 3a05bc4fff61de49b3840eb777a981457f2f8efe..eb08bd99e945fe053ea54acdcd9ee564ddda7576 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBlockContainer.java
+++ b/src/org/apache/fop/fo/flow/FoBlockContainer.java
@@ -55,24 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:block-container flow object.
@@ -175,7 +171,7 @@ public class FoBlockContainer extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -187,7 +183,7 @@ public class FoBlockContainer extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoCharacter.java b/src/org/apache/fop/fo/flow/FoCharacter.java
index 298ef788102fa7216906ba3546c24867a1237749..a90d2c53f23d5902d027b8a1c0c694db2e77126a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoCharacter.java
+++ b/src/org/apache/fop/fo/flow/FoCharacter.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:character flow object.

diff --git a/src/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
index b68c2ff9b76a8e8d3250ce0ec024aa7d90695eb7..4a34f40f68ce9dffbe43cc7d7a728f7fa1fab54e 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:external-graphic flow object.

diff --git a/src/org/apache/fop/fo/flow/FoFloat.java b/src/org/apache/fop/fo/flow/FoFloat.java
index 58a8973867892cc1e29e81f184ba833f6b5bacb7..fbe659c4cd8752082263e20b3966d172aa1e7a66 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFloat.java
+++ b/src/org/apache/fop/fo/flow/FoFloat.java
@@ -55,23 +55,19 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:float flow object.
@@ -152,7 +148,7 @@ public class FoFloat extends FONode {
             FObjects.fobjects.makeFlowObject
                     (foTree, this, ev, stateFlags | FONode.MC_FLOAT);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -164,7 +160,7 @@ public class FoFloat extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                             (foTree, this, ev, stateFlags | FONode.MC_FLOAT);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoFlow.java b/src/org/apache/fop/fo/flow/FoFlow.java
index 6a8bbcbb2b781632ccc149ed688e4c034c40fe74..a87ab42f1036b578a25d073c5e8c89e626af002c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFlow.java
+++ b/src/org/apache/fop/fo/flow/FoFlow.java
@@ -55,23 +55,19 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -135,7 +131,7 @@ public class FoFlow extends FONode {
             FObjects.fobjects.makeFlowObject
                             (foTree, this, ev, FONode.FLOW_SET);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -146,7 +142,7 @@ public class FoFlow extends FONode {
                             //("Generating subsequent block for flow.");
                     FObjects.fobjects.makeFlowObject
                             (foTree, this, ev, FONode.FLOW_SET);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoFootnote.java b/src/org/apache/fop/fo/flow/FoFootnote.java
index 81822e91ff6b1a3a21641b2939ed4e82eb96d10a..54c77c2d29218a28bd616fff7d54330b693f1ea8 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFootnote.java
+++ b/src/org/apache/fop/fo/flow/FoFootnote.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:footnote flow object.
@@ -156,7 +154,7 @@ public class FoFootnote extends FONode {
                 throw new FOPException("No inline in footnote.");
             new FoInline
                     (getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE);
-            ev =  xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev =  xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             // Look for the footnote-body
@@ -166,7 +164,7 @@ public class FoFootnote extends FONode {
                 throw new FOPException("No footnote-body in footnote.");
             new FoFootnoteBody
                     (getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             /*

diff --git a/src/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/org/apache/fop/fo/flow/FoFootnoteBody.java
index f11970fb695e401a4440bec0d2caedd1a5886614..8719e9b930be29b88c347787d7d324ee16f3bc62 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFootnoteBody.java
+++ b/src/org/apache/fop/fo/flow/FoFootnoteBody.java
@@ -55,23 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:footnote-body flow object.
@@ -148,7 +145,7 @@ public class FoFootnoteBody extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -160,7 +157,7 @@ public class FoFootnoteBody extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
index 25f15c6a6113a965d5e2327034411ff032d5398b..f26c53f5b2b54d53903aa30a6061b0ff41ba8d25 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
+++ b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:initial-property-set flow object.

diff --git a/src/org/apache/fop/fo/flow/FoInline.java b/src/org/apache/fop/fo/flow/FoInline.java
index d1662552c156a27694938c85523fda5a7d68c003..b84c0110d461323866466c100bb0bd5767974294 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInline.java
+++ b/src/org/apache/fop/fo/flow/FoInline.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:inline flow object.
@@ -173,7 +170,7 @@ public class FoInline extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -182,7 +179,7 @@ public class FoInline extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoInlineContainer.java b/src/org/apache/fop/fo/flow/FoInlineContainer.java
index 042ccf8b900eb6c14b28013c5116e38473f220cd..d975b7522d71284e387d323cdcf81507a44e8e87 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInlineContainer.java
+++ b/src/org/apache/fop/fo/flow/FoInlineContainer.java
@@ -55,23 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:inline-container flow object.
@@ -170,7 +167,7 @@ public class FoInlineContainer extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -182,7 +179,7 @@ public class FoInlineContainer extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
index bac28ec6db273cf33b87e9720af21c1a71090943..a207c37c26ed150f063bf3d39c13a0f7f4d9c45e 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
+++ b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:instream-foreign-object flow object.

diff --git a/src/org/apache/fop/fo/flow/FoLeader.java b/src/org/apache/fop/fo/flow/FoLeader.java
index 552f8096f4f90cc9346271ac0b70ec3bdaabc781..b44f0cb57ea9d1d26c2eaabbce15f964b8df2fed 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoLeader.java
+++ b/src/org/apache/fop/fo/flow/FoLeader.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:leader flow object.
@@ -176,7 +173,7 @@ public class FoLeader extends FONode {
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -185,7 +182,7 @@ public class FoLeader extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoListBlock.java b/src/org/apache/fop/fo/flow/FoListBlock.java
index 685b309fef08ce2f3e24909317e765481d60fedc..c7400898b10344ee5417485bc7ea22195594a845 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListBlock.java
+++ b/src/org/apache/fop/fo/flow/FoListBlock.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:list-block flow object.
@@ -166,7 +164,7 @@ public class FoListBlock extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -177,7 +175,7 @@ public class FoListBlock extends FONode {
                    != null) {
                 new FoListItem(getFOTree(), this, ev, stateFlags);
                 numItems++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 

diff --git a/src/org/apache/fop/fo/flow/FoListItem.java b/src/org/apache/fop/fo/flow/FoListItem.java
index 925ba4d7e42f007d3cc71cc6d7163b0f840ad0bc..1ddc5ef37630ddc6c9b4eb087246963aefd15039 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItem.java
+++ b/src/org/apache/fop/fo/flow/FoListItem.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:list-item flow object.
@@ -160,7 +158,7 @@ public class FoListItem extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -172,7 +170,7 @@ public class FoListItem extends FONode {
                 throw new FOPException
                         ("No list-item-label in list-item.");
             new FoListItemLabel(getFOTree(), this, ev, stateFlags);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             // Look for one list-item-body
@@ -183,7 +181,7 @@ public class FoListItem extends FONode {
                 throw new FOPException
                         ("No list-item-body in list-item.");
             new FoListItemBody(getFOTree(), this, ev, stateFlags);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             /*

diff --git a/src/org/apache/fop/fo/flow/FoListItemBody.java b/src/org/apache/fop/fo/flow/FoListItemBody.java
index 474ad3fc3ca1846bd8d3ec03c6ce9ec8ede2e3ba..669aa306dadcc1741b372210f6d8824cf9b40f01 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItemBody.java
+++ b/src/org/apache/fop/fo/flow/FoListItemBody.java
@@ -55,24 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:list-item-body flow object.
@@ -151,7 +147,7 @@ public class FoListItemBody extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -163,7 +159,7 @@ public class FoListItemBody extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoListItemLabel.java b/src/org/apache/fop/fo/flow/FoListItemLabel.java
index 12585f601c095eaddf4bd09374769894acf90f6b..25220118cba48649dcfa007ecf71878e8ad34615 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItemLabel.java
+++ b/src/org/apache/fop/fo/flow/FoListItemLabel.java
@@ -55,24 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:list-item-label flow object.
@@ -151,7 +147,7 @@ public class FoListItemLabel extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -163,7 +159,7 @@ public class FoListItemLabel extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoMarker.java b/src/org/apache/fop/fo/flow/FoMarker.java
index 7286d9dba524a5b4a1b39f9ee40099ae18f2cc2f..ef7f336b9a9e6003c1dd68cac67c9f5ecaa54d58 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMarker.java
+++ b/src/org/apache/fop/fo/flow/FoMarker.java
@@ -55,24 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:marker flow object.
@@ -144,7 +140,7 @@ public class FoMarker extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -153,7 +149,7 @@ public class FoMarker extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoMultiCase.java b/src/org/apache/fop/fo/flow/FoMultiCase.java
index 9528ead0b47932178a8b4696a8ab2d08b7d87148..181c3281c6b5bf46a1d899af022f7cea36fea93c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiCase.java
+++ b/src/org/apache/fop/fo/flow/FoMultiCase.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:multi-case flow object.
@@ -156,7 +153,7 @@ public class FoMultiCase extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -165,7 +162,7 @@ public class FoMultiCase extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoMultiProperties.java b/src/org/apache/fop/fo/flow/FoMultiProperties.java
index 68a001366d14439112882f90da3e2cee2bcc970d..e388f895cb1833d6a9e3bd6664c08bfcf35c8fea 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiProperties.java
+++ b/src/org/apache/fop/fo/flow/FoMultiProperties.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:multi-properties flow object.
@@ -147,7 +145,7 @@ public class FoMultiProperties extends FONode {
                    != null) {
                 new FoMultiPropertySet(getFOTree(), this, ev, stateFlags);
                 numSets++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -162,7 +160,7 @@ public class FoMultiProperties extends FONode {
                 throw new FOPException
                         ("No wrapper in multi-properties.");
             new FoWrapper(getFOTree(), this, ev, stateFlags);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             /*

diff --git a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
index f66c372a47970e2f301b2c61fc89a9ac9ec21a14..1671584890aef3c0b421ef62d99b2ce4e12ef31c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
+++ b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
@@ -55,21 +55,16 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:multi-property-set flow object.

diff --git a/src/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/org/apache/fop/fo/flow/FoMultiSwitch.java
index d86a67ff02e26a7b04c433d3f0482e277e5d8c54..27e88443a88a1092ff051f601990f88232619da9 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiSwitch.java
+++ b/src/org/apache/fop/fo/flow/FoMultiSwitch.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:multi-switch flow object.
@@ -147,7 +145,7 @@ public class FoMultiSwitch extends FONode {
                    != null) {
                 new FoMultiCase(getFOTree(), this, ev, stateFlags);
                 numCases++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiToggle.java b/src/org/apache/fop/fo/flow/FoMultiToggle.java
index ed1d83b26721363db71201b0aea63a069e0d09f6..6e94feba5df834980f0ad887dd613d8d7bc6ee1c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiToggle.java
+++ b/src/org/apache/fop/fo/flow/FoMultiToggle.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:multi-toggle flow object.
@@ -153,7 +150,7 @@ public class FoMultiToggle extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA) {
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     }
                     pool.surrenderEvent(ev);
                 }
@@ -162,7 +159,7 @@ public class FoMultiToggle extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoNoFo.java b/src/org/apache/fop/fo/flow/FoNoFo.java
index a3cfe43c264069454ee2efc4df2faac702edc0ba..3cd0f3058b5a6a0d6e5860306e47eba393196b28 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoNoFo.java
+++ b/src/org/apache/fop/fo/flow/FoNoFo.java
@@ -55,21 +55,10 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:no-fo flow object.

diff --git a/src/org/apache/fop/fo/flow/FoPageNumber.java b/src/org/apache/fop/fo/flow/FoPageNumber.java
index 30e72be983ee511c55c4308b59268627893e85f6..d07021da1bd74cbf3b96853d76a3a30e175a6963 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageNumber.java
+++ b/src/org/apache/fop/fo/flow/FoPageNumber.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:page-number flow object.

diff --git a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
index 52a850ca10586e8004798c13fcf183ce63804b00..57538d4e9697d07891bde83170f4a3a091f29f71 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
+++ b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:page-number-citation flow object.

diff --git a/src/org/apache/fop/fo/flow/FoPageSequence.java b/src/org/apache/fop/fo/flow/FoPageSequence.java
index 431deb09e0c2bbf64959b103a5d9946a5dc29097..4e77153d7933cc1e8ec3b4fda6b51bb85333e448 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageSequence.java
+++ b/src/org/apache/fop/fo/flow/FoPageSequence.java
@@ -55,23 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.NoSuchElementException;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
-import java.util.NoSuchElementException;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -155,7 +152,7 @@ public class FoPageSequence extends FONode {
                 // process the title
                 title = numChildren();
                 new FoTitle(getFOTree(), this, ev);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } // else ignore
 
@@ -168,7 +165,7 @@ public class FoPageSequence extends FONode {
                 if (firstStaticContent != -1)
                     firstStaticContent = numChildren();
                 new FoStaticContent(getFOTree(), this, ev);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -181,14 +178,14 @@ public class FoPageSequence extends FONode {
                 throw new FOPException("No flow found.");
             firstFlow = numChildren();
             new FoFlow(getFOTree(), this, ev);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             while ((ev = xmlevents.expectStartElement
                             (FObjectNames.FLOW, XMLEvent.DISCARD_W_SPACE))
                    != null) {
                 // Loop over remaining fo:page-sequences
                 new FoFlow(getFOTree(), this, ev);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/flow/FoPcdata.java b/src/org/apache/fop/fo/flow/FoPcdata.java
index bdafa5a7ecc20464e37b3e098dee3bd0aee69f36..31fd0aeef93b6d57ac700f6aed6daaf2f262d358 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPcdata.java
+++ b/src/org/apache/fop/fo/flow/FoPcdata.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements #PcdATA within page-sequence flow objects.

diff --git a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
index 7552afce0fbe044883e52234ee28fe12fe286f9d..52deff1cd8735cc28b191e6e246b7fafc5e9480c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
+++ b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
@@ -55,21 +55,16 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:retrieve-marker flow object.

diff --git a/src/org/apache/fop/fo/flow/FoStaticContent.java b/src/org/apache/fop/fo/flow/FoStaticContent.java
index 52940cb4971e1c4ef6a3fbe871130409d46afe37..01e3cfb0d787cc6a8085e7aa4436bd89094d8d4c 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoStaticContent.java
+++ b/src/org/apache/fop/fo/flow/FoStaticContent.java
@@ -55,23 +55,19 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -137,7 +133,7 @@ public class FoStaticContent extends FONode {
             FObjects.fobjects.makeFlowObject
                                     (foTree, this, ev, FONode.STATIC_SET);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             while ((ev = xmlevents.expectBlock()) != null) {
@@ -146,7 +142,7 @@ public class FoStaticContent extends FONode {
                     //("Generating subsequent block for static-content.");
                 FObjects.fobjects.makeFlowObject
                                     (foTree, this, ev, FONode.STATIC_SET);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } catch(UnexpectedStartElementException e) {

diff --git a/src/org/apache/fop/fo/flow/FoTable.java b/src/org/apache/fop/fo/flow/FoTable.java
index 995d5644ea460bec6996324b060c4424111dda56..c5fdc4b916302c0871d823ca8134574f2c634046 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTable.java
+++ b/src/org/apache/fop/fo/flow/FoTable.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table flow object.
@@ -188,7 +186,7 @@ public class FoTable extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -199,7 +197,7 @@ public class FoTable extends FONode {
                    != null) {
                 new FoTableColumn(getFOTree(), this, ev, stateFlags);
                 numColumns++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -210,7 +208,7 @@ public class FoTable extends FONode {
                    != null) {
                 headerOffset = numChildren();
                 new FoTableHeader(getFOTree(), this, ev, stateFlags);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -221,7 +219,7 @@ public class FoTable extends FONode {
                    != null) {
                 footerOffset = numChildren();
                 new FoTableFooter(getFOTree(), this, ev, stateFlags);
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -235,7 +233,7 @@ public class FoTable extends FONode {
             firstBodyOffset = numChildren();
             new FoTableBody(getFOTree(), this, ev, stateFlags);
             numBodies++;
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             while ((ev = xmlevents.expectStartElement
                         (FObjectNames.TABLE_BODY, XMLEvent.DISCARD_W_SPACE))
@@ -243,7 +241,7 @@ public class FoTable extends FONode {
                 // Loop over remaining fo:table-body's
                 new FoTableBody(getFOTree(), this, ev, stateFlags);
                 numBodies++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 

diff --git a/src/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/org/apache/fop/fo/flow/FoTableAndCaption.java
index 83222f248b31c1f90fe958460a8cb5ed48f640ce..aa463cbf14b8d5471fdab49020e1943b2379ed88 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableAndCaption.java
+++ b/src/org/apache/fop/fo/flow/FoTableAndCaption.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table-and-caption flow object.
@@ -168,7 +166,7 @@ public class FoTableAndCaption extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -179,7 +177,7 @@ public class FoTableAndCaption extends FONode {
                    != null) {
                 new FoTableCaption(getFOTree(), this, ev, stateFlags);
                 captionOffset = numMarkers;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -191,7 +189,7 @@ public class FoTableAndCaption extends FONode {
                 throw new FOPException("No table found.");
             tableOffset = numChildren();
             new FoTable(getFOTree(), this, ev, stateFlags);
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
 
             /*

diff --git a/src/org/apache/fop/fo/flow/FoTableBody.java b/src/org/apache/fop/fo/flow/FoTableBody.java
index cfdf58a103e683b60f4a0bc11eb02dcb0aaa6262..274ba8da36010e0e544a5bc950fe59298668b2a3 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableBody.java
+++ b/src/org/apache/fop/fo/flow/FoTableBody.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table-body flow object.
@@ -169,7 +167,7 @@ public class FoTableBody extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -180,7 +178,7 @@ public class FoTableBody extends FONode {
                    != null) {
                 new FoTableRow(getFOTree(), this, ev, stateFlags);
                 numRows++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -194,7 +192,7 @@ public class FoTableBody extends FONode {
                        != null) {
                     new FoTableCell(getFOTree(), this, ev, stateFlags);
                     numCells++;
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
                 if (numCells == 0)

diff --git a/src/org/apache/fop/fo/flow/FoTableCaption.java b/src/org/apache/fop/fo/flow/FoTableCaption.java
index 958aaff3b703140142681be15a865ca5b65554d7..606b9aeb897ef8cdd60ffc1d46a3c395a43d0856 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableCaption.java
+++ b/src/org/apache/fop/fo/flow/FoTableCaption.java
@@ -55,23 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:table-caption flow object.
@@ -160,7 +157,7 @@ public class FoTableCaption extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -172,7 +169,7 @@ public class FoTableCaption extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoTableCell.java b/src/org/apache/fop/fo/flow/FoTableCell.java
index a0b4b6a7af6ba89a57f6907c463f3f5a376ac535..1224115e755adb24bad2264914cc35ac4cdab68a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableCell.java
+++ b/src/org/apache/fop/fo/flow/FoTableCell.java
@@ -55,23 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:table-cell flow object.
@@ -169,7 +166,7 @@ public class FoTableCell extends FONode {
             // Generate the flow object
             FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
             // Clear the blockage
-            ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+            ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
             pool.surrenderEvent(ev);
             // Get the rest of the %block;s
             do {
@@ -181,7 +178,7 @@ public class FoTableCell extends FONode {
                     // Generate the flow object
                     FObjects.fobjects.makeFlowObject
                                             (foTree, this, ev, stateFlags);
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
             } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoTableColumn.java b/src/org/apache/fop/fo/flow/FoTableColumn.java
index 0144a043d214a98aa5f161982fc018f55685256f..d555acd3a82ed346d8e4e76059c2373b27dae367 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableColumn.java
+++ b/src/org/apache/fop/fo/flow/FoTableColumn.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:table-column flow object.

diff --git a/src/org/apache/fop/fo/flow/FoTableFooter.java b/src/org/apache/fop/fo/flow/FoTableFooter.java
index f5a1979531cc1a801f502688dd8c89c82c792390..3eb8b21e64c9cf68f77a8b148c112e9a14979614 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableFooter.java
+++ b/src/org/apache/fop/fo/flow/FoTableFooter.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table-footer flow object.
@@ -169,7 +167,7 @@ public class FoTableFooter extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -180,7 +178,7 @@ public class FoTableFooter extends FONode {
                    != null) {
                 new FoTableRow(getFOTree(), this, ev, stateFlags);
                 numRows++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -194,7 +192,7 @@ public class FoTableFooter extends FONode {
                        != null) {
                     new FoTableCell(getFOTree(), this, ev, stateFlags);
                     numCells++;
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
                 if (numCells == 0)

diff --git a/src/org/apache/fop/fo/flow/FoTableHeader.java b/src/org/apache/fop/fo/flow/FoTableHeader.java
index 171fb63f53c9b74ff5169c1786c51fcc26a612bf..e94bef7599ff10f05f0ff9709f7e729f4fc00fac 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableHeader.java
+++ b/src/org/apache/fop/fo/flow/FoTableHeader.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table-header flow object.
@@ -169,7 +167,7 @@ public class FoTableHeader extends FONode {
                    != null) {
                 new FoMarker(getFOTree(), this, ev, stateFlags);
                 numMarkers++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -180,7 +178,7 @@ public class FoTableHeader extends FONode {
                    != null) {
                 new FoTableRow(getFOTree(), this, ev, stateFlags);
                 numRows++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
 
@@ -194,7 +192,7 @@ public class FoTableHeader extends FONode {
                        != null) {
                     new FoTableCell(getFOTree(), this, ev, stateFlags);
                     numCells++;
-                    ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                    ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     pool.surrenderEvent(ev);
                 }
                 if (numCells == 0)

diff --git a/src/org/apache/fop/fo/flow/FoTableRow.java b/src/org/apache/fop/fo/flow/FoTableRow.java
index 5e6a88df5be0623fe11a6732ec896a0b69508533..016ac0d827b0ef47786f8c1fcd80e077902de401 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableRow.java
+++ b/src/org/apache/fop/fo/flow/FoTableRow.java
@@ -55,22 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:table-row flow object.
@@ -166,7 +164,7 @@ public class FoTableRow extends FONode {
                    != null) {
                 new FoTableCell(getFOTree(), this, ev, stateFlags);
                 numCells++;
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
             if (numCells == 0)

diff --git a/src/org/apache/fop/fo/flow/FoTitle.java b/src/org/apache/fop/fo/flow/FoTitle.java
index ef744901eccbb8e2f134d3d5e70439f2643c2ab2..9ac5841add9759bba9d39a7154a716946fa037c6 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTitle.java
+++ b/src/org/apache/fop/fo/flow/FoTitle.java
@@ -55,26 +55,21 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -155,7 +150,7 @@ public class FoTitle extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, FONode.TITLE_SET);
                     if (ev.getFoType() != FObjectNames.PCDATA)
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                         pool.surrenderEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
@@ -163,7 +158,7 @@ public class FoTitle extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/flow/FoWrapper.java b/src/org/apache/fop/fo/flow/FoWrapper.java
index 8cb592aff6f78f804de0b83344bf19027923e252..3f666eabcc04e6c82c184a0bfaa022be8d1ffd57 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoWrapper.java
+++ b/src/org/apache/fop/fo/flow/FoWrapper.java
@@ -55,24 +55,20 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FObjects;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.FObjects;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
 import org.apache.fop.xml.UnexpectedStartElementException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.messaging.MessageHandler;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:wrapper flow object.
@@ -141,7 +137,7 @@ public class FoWrapper extends FONode {
                     FObjects.fobjects.makeFlowObject
                                 (foTree, this, ev, stateFlags);
                     if (ev.getFoType() != FObjectNames.PCDATA)
-                        ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                        ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                         pool.surrenderEvent(ev);
                 }
             } catch(UnexpectedStartElementException e) {
@@ -149,7 +145,7 @@ public class FoWrapper extends FONode {
                 MessageHandler.logln
                         ("Ignoring unexpected Start Element: "
                                                          + ev.getQName());
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             }
         } while (ev != null);

diff --git a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index f844acf8fdf09237fbe4b1c165706f4b6744256c..0413b97536f859a7f1c02ff0cb6b2d1e2aad3f81 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -54,27 +54,22 @@
  */
 package org.apache.fop.fo.pagination;
 
-import java.util.Collection;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FOTree;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.UriLocalName;
-import org.apache.fop.xml.XMLNamespaces;
 import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster;
-import org.apache.fop.fo.pagination.PageSequenceMaster;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * <tt>FoLayoutMasterSet</tt> is the class which processes the
@@ -220,7 +215,7 @@ public class FoLayoutMasterSet extends FONode {
                     throw new FOPException
                             ("Aargh! expectStartElement(events, list)");
                 // Flush the master event
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
index a441df681ffba7d7b47e7918717774338b2580d9..63c6a6e01bbf2a6abea64bb44f89d1e89f193518 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
@@ -55,27 +55,21 @@
 package org.apache.fop.fo.pagination;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.BitSet;
 import java.util.NoSuchElementException;
 
-// FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.xml.UriLocalName;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FONode;
 import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:page-sequence-master flow object.  These Fos are
@@ -258,7 +252,7 @@ public class FoPageSequenceMaster extends FONode {
                 } else
                     throw new FOPException
                             ("Aargh! expectStartElement(events, list)");
-                ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+                ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                 pool.surrenderEvent(ev);
             } while (true);
         } catch (NoSuchElementException e) {
@@ -349,7 +343,7 @@ public class FoPageSequenceMaster extends FONode {
                     //    ("Found conditional-page-master-reference");
                     new FoConditionalPageMasterReference(foTree, this, ev);
                     ev = this.xmlevents.getEndElement
-                                            (this.xmlevents.DISCARD_EV, ev);
+                                            (SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
                     this.pool.surrenderEvent(ev);
                 } while (true);
             } catch (NoSuchElementException e) {

diff --git a/src/org/apache/fop/fo/pagination/FoRegionAfter.java b/src/org/apache/fop/fo/pagination/FoRegionAfter.java
index 2583729ef2be7d01c8e6f90e20a648d25cd8272e..9887fef0b2097719ea9f0fe9a0ed33892a92df5e 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionAfter.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionAfter.java
@@ -55,13 +55,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoRegionBefore.java b/src/org/apache/fop/fo/pagination/FoRegionBefore.java
index c748d1354957e7f3566647040f2e17cdf891fc85..316efa92acbe3e75570c08b3b1788feaccf8e000 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionBefore.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionBefore.java
@@ -55,13 +55,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
index 1190d4c618e0d6c8e17f8ece5b72005cca6cf636..c9e40fd442cf7fbae345da1b006f1ac21064c712 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
@@ -55,21 +55,16 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoRegionBody.java b/src/org/apache/fop/fo/pagination/FoRegionBody.java
index 8941413d916a0d2902c9e4a1b4c3503ca17685c0..93c2e37b0a0df55e01bd454d1e4f79401701b4dc 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionBody.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionBody.java
@@ -55,21 +55,17 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoRegionEnd.java b/src/org/apache/fop/fo/pagination/FoRegionEnd.java
index e3664ff83832f708e9338c03c4c9dda4a15c8a93..6364c78b46a8cdc17add35d18453234b316e3a64 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionEnd.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionEnd.java
@@ -55,13 +55,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
 
 
 /**

diff --git a/src/org/apache/fop/fo/pagination/FoRegionStart.java b/src/org/apache/fop/fo/pagination/FoRegionStart.java
index 91caa15cf36088cd62d7cb5951dea8f1ae78d1cf..0ba7a75a0b121a8ed5d7185f60ceccea5e097950 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionStart.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionStart.java
@@ -55,13 +55,12 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
index 543fba5192831f7eaea8694b6c132a970a89c7d1..90d651fd053642834aafe4bb8f34621dffb0ae1f 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
@@ -55,21 +55,16 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.TreeException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
 
 /**
  * Implements the fo:simple-page-master flow object

diff --git a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
index 7926890514bd1a484d415b48550b4193bd04b993..b7b5ffb1521a6aa99671f954f98ed3137e5d7f85 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
@@ -55,24 +55,21 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.xml.FoXMLEvent;
+import java.util.Arrays;
+import java.util.BitSet;
+
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.datastructs.TreeException;
+import org.apache.fop.datatypes.NCName;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
+import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.TreeException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.Ints;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.BitSet;
+import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
 
 /**
  * Implements the fo:simple-page-master flow object
@@ -149,7 +146,7 @@ public class FoSimplePageMaster extends FONode {
                     + getMasterName());
         // Process region-body
         regionBody = new FoRegionBody(foTree, this, regionEv);
-        regionEv = xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+        regionEv = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
         pool.surrenderEvent(regionEv);
 
         // Remaining regions are optional
@@ -159,7 +156,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionBefore = new FoRegionBefore(foTree, this, regionEv);
             regionEv =
-                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+                xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -169,7 +166,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionAfter = new FoRegionAfter(foTree, this, regionEv);
             regionEv =
-                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+                xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -179,7 +176,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionStart = new FoRegionStart(foTree, this, regionEv);
             regionEv =
-                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+                xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 
@@ -189,7 +186,7 @@ public class FoSimplePageMaster extends FONode {
         {
             regionEnd = new FoRegionEnd(foTree, this, regionEv);
             regionEv =
-                xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+                xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
             pool.surrenderEvent(regionEv);
         }
 

diff --git a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
index 83c42b5272521c1aebc3b72e9c83f6c74e461c95..05720c6bbd8da486f24cbdab5791c38d8125b70a 100644 (file)
--- a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -55,33 +55,23 @@
 package org.apache.fop.fo.pagination;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Set;
-import java.util.Iterator;
 
-// FOP
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.*;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.IntegerType;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster
-                                                .FoSinglePageMasterReference;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster
-                                            .FoRepeatablePageMasterReference;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster
-                                        .FoRepeatablePageMasterAlternatives;
-import org.apache.fop.fo.pagination.FoPageSequenceMaster
-        .FoRepeatablePageMasterAlternatives.FoConditionalPageMasterReference;
+import org.apache.fop.fo.pagination.FoPageSequenceMaster.FoRepeatablePageMasterAlternatives.FoConditionalPageMasterReference;
+import org.apache.fop.fo.properties.BlankOrNotBlank;
+import org.apache.fop.fo.properties.MaximumRepeats;
+import org.apache.fop.fo.properties.OddOrEven;
+import org.apache.fop.fo.properties.PagePosition;
 
 /**
  * Encodes an <b>fo:page-sequence-master</b> and associated

diff --git a/src/org/apache/fop/fo/properties/AbsolutePosition.java b/src/org/apache/fop/fo/properties/AbsolutePosition.java
index bcf7112d180a119d24fba12efbf18d5e2dc12786..ac16b458afc738349739c29296abaf3bafa3be33 100644 (file)
--- a/src/org/apache/fop/fo/properties/AbsolutePosition.java
+++ b/src/org/apache/fop/fo/properties/AbsolutePosition.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datastructs.ROStringArray;
 
 public class AbsolutePosition extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ActiveState.java b/src/org/apache/fop/fo/properties/ActiveState.java
index 989fe4db7063448ce7ac954e22ff83d7b2b314f9..2d33e4f56242aa3170963e1bf75f47835f09869c 100644 (file)
--- a/src/org/apache/fop/fo/properties/ActiveState.java
+++ b/src/org/apache/fop/fo/properties/ActiveState.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ActiveState extends Property  {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/AlignmentAdjust.java b/src/org/apache/fop/fo/properties/AlignmentAdjust.java
index eeededee49c8919d5ec50e25ff68d26f9e004b33..11162dfb721dd8e0bc40b280eefdc2853100d52d 100644 (file)
--- a/src/org/apache/fop/fo/properties/AlignmentAdjust.java
+++ b/src/org/apache/fop/fo/properties/AlignmentAdjust.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class AlignmentAdjust extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/AlignmentBaseline.java b/src/org/apache/fop/fo/properties/AlignmentBaseline.java
index 2f8fb51166232b296d6fedf0a07b12d7896cdc3a..07dec7f2f16c234765d3344dc489fdf91016daf1 100644 (file)
--- a/src/org/apache/fop/fo/properties/AlignmentBaseline.java
+++ b/src/org/apache/fop/fo/properties/AlignmentBaseline.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class AlignmentBaseline extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/AutoRestore.java b/src/org/apache/fop/fo/properties/AutoRestore.java
index d7501888363eaf1eb49594f6238d7d599345d0a6..7c6a569b2de0296846d7c0f9c385038412de7c5a 100644 (file)
--- a/src/org/apache/fop/fo/properties/AutoRestore.java
+++ b/src/org/apache/fop/fo/properties/AutoRestore.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Bool;
 
 public class AutoRestore extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/Azimuth.java b/src/org/apache/fop/fo/properties/Azimuth.java
index fdb1732f205f28501cf353d93f33a071d8a01152..f041086bb81edccb350f5d1a19acd986ca737018 100644 (file)
--- a/src/org/apache/fop/fo/properties/Azimuth.java
+++ b/src/org/apache/fop/fo/properties/Azimuth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Azimuth extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Background.java b/src/org/apache/fop/fo/properties/Background.java
index fa7d3874ffae00e579fcc17f2cbe1ff3ebb92eaa..e0f4831897857ea00cf57938751244b730ae3e02 100644 (file)
--- a/src/org/apache/fop/fo/properties/Background.java
+++ b/src/org/apache/fop/fo/properties/Background.java
@@ -51,24 +51,22 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.*;
+import java.util.Iterator;
+import java.util.ListIterator;
+
+import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.messaging.MessageHandler;
 
-import java.util.ListIterator;
-import java.util.Iterator;
-
 public class Background extends Property  {
     public static final int dataTypes = SHORTHAND | INHERIT;
     public static final int traitMapping = SHORTHAND_MAP;

diff --git a/src/org/apache/fop/fo/properties/BackgroundAttachment.java b/src/org/apache/fop/fo/properties/BackgroundAttachment.java
index af6f83c9a30704d00c4484df0261ab76a75ac174..44287d72a5cb827ff85b23287151851c909dce31 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundAttachment.java
+++ b/src/org/apache/fop/fo/properties/BackgroundAttachment.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
 import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundAttachment extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BackgroundColor.java b/src/org/apache/fop/fo/properties/BackgroundColor.java
index 96931e04b379e7758eca325caad8df8413b861dc..5b935b3317b8c4749b904630e28be99068124941 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundColor.java
+++ b/src/org/apache/fop/fo/properties/BackgroundColor.java
@@ -51,10 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_TRANS | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BackgroundImage.java b/src/org/apache/fop/fo/properties/BackgroundImage.java
index 27b87002930ed8e090cb3f1c4a79572705b030c9..db04b79d508505d462156eb952d3a4b35c1db116 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundImage.java
+++ b/src/org/apache/fop/fo/properties/BackgroundImage.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BackgroundImage extends Property  {
     public static final int dataTypes = URI_SPECIFICATION | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BackgroundPosition.java b/src/org/apache/fop/fo/properties/BackgroundPosition.java
index c8a116134123823b86472226954b79101a127442..ef7bc1b138b8261ff895ae71c793b0223c999abb 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundPosition.java
+++ b/src/org/apache/fop/fo/properties/BackgroundPosition.java
@@ -51,20 +51,19 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Length;
+import java.util.Iterator;
+
+import org.apache.fop.datastructs.ROStringArray;
 import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.Percentage;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundPosition extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java b/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java
index 329be9660092055587e5cb1077d35c8bb0663bac..c1f627495e9e0ae8c954b9c0db40956c045476c9 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java
+++ b/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.Percentage;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundPositionHorizontal extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java b/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java
index 2192d8502c0807647e8abc286d733e4390f6fcf7..cf02ae9169025fcb148714dde2999221aef0984a 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java
+++ b/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.Percentage;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundPositionVertical extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BackgroundRepeat.java b/src/org/apache/fop/fo/properties/BackgroundRepeat.java
index f7178f17163df09fd0b1cd9848f3be4b1982e36c..207091d2a64688c1ca7b9e116da2703f7e2d95f9 100644 (file)
--- a/src/org/apache/fop/fo/properties/BackgroundRepeat.java
+++ b/src/org/apache/fop/fo/properties/BackgroundRepeat.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BackgroundRepeat extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BaselineShift.java b/src/org/apache/fop/fo/properties/BaselineShift.java
index 85d35f4660ac0f7cf7c9aa4d2798ecf82bda0350..ff9a4fcf68dd5d89fa0d7831ea0d94aa5df094c8 100644 (file)
--- a/src/org/apache/fop/fo/properties/BaselineShift.java
+++ b/src/org/apache/fop/fo/properties/BaselineShift.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BaselineShift extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BlankOrNotBlank.java b/src/org/apache/fop/fo/properties/BlankOrNotBlank.java
index a3e3dc50e657d2498dadbb269b03e937ddfc5783..42f4959b9bf4eb6a39a5fe919fa3692422f69ac2 100644 (file)
--- a/src/org/apache/fop/fo/properties/BlankOrNotBlank.java
+++ b/src/org/apache/fop/fo/properties/BlankOrNotBlank.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BlankOrNotBlank extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimension.java b/src/org/apache/fop/fo/properties/BlockProgressionDimension.java
index 75434d9472c88c86242d988256ee1daf3ca4a2d2..9d5574ef4ec892c5123f14369052c8687be32b81 100644 (file)
--- a/src/org/apache/fop/fo/properties/BlockProgressionDimension.java
+++ b/src/org/apache/fop/fo/properties/BlockProgressionDimension.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BlockProgressionDimension extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java
index 66ea5f53f2bb02a86fa03cf05dc5bc1bc5be7132..a18f306021b81e0468f2373299afd07945f5d566 100644 (file)
--- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java
+++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BlockProgressionDimensionMaximum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java
index 25175922c175331f018d871f2bf96ea3b34d4e57..18022a8cc74c46490561c2ff53578d40e6ec1af7 100644 (file)
--- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java
+++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BlockProgressionDimensionMinimum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java
index 1b5af5cf1ae6899aa043859a120ebb5d9525788c..feeeeb64de31058d3767b1835bfb4e2732af9837 100644 (file)
--- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java
+++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BlockProgressionDimensionOptimum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/Border.java b/src/org/apache/fop/fo/properties/Border.java
index e822a348dfa43e02119d119547f15b7d3ba6d037..1c68ec8ecfdd02fed39704607e3589d34a307bdf 100644 (file)
--- a/src/org/apache/fop/fo/properties/Border.java
+++ b/src/org/apache/fop/fo/properties/Border.java
@@ -51,22 +51,17 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.messaging.MessageHandler;
 
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
-
 public class Border extends Property  {
     public static final int dataTypes = SHORTHAND;
     public static final int traitMapping = SHORTHAND_MAP;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterColor.java b/src/org/apache/fop/fo/properties/BorderAfterColor.java
index 0ae4a0fee0165ea355ec97c258ee1d265f556c1d..abd437b8867561e508de5c071d9313dc950a1ea5 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterColor.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterColor.java
@@ -51,10 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderAfterColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java b/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java
index c662252263e28d5efd3f62f2cf6e3850d0e6f619..2cb0123878edfaf79601ff4b4c3c80e7e50890f1 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PrecedenceCommon;
 
 public class BorderAfterPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterStyle.java b/src/org/apache/fop/fo/properties/BorderAfterStyle.java
index 20cc4e6e32fed5e4ed7c8b9a39c557b69b3fd597..cdd02e6e01869cba956b622dccfc054e5191e46f 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderAfterStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidth.java b/src/org/apache/fop/fo/properties/BorderAfterWidth.java
index 9ca6855eab6d5f81b7c040dadcfb71ece934d77f..a5d914de247b90d67b0bbbd5bfd928ea3ea42def 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterWidth.java
@@ -52,12 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderAfterWidth extends BorderCommonWidth {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java
index 3f58a333e31f69b3d5cce6fbfb4e5f9c1193ed6b..1e55e9a621e8d94fd1220c326c4167fcdcc274bf 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderAfterWidthConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
index 5a7e04a84fcf0cb48a06f3474c831ff21de42e9d..f33a9970dd4142a78e86fdf0eb552cec64512c34 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java
@@ -51,10 +51,9 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderAfterWidthLength extends BorderCommonWidth  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeColor.java b/src/org/apache/fop/fo/properties/BorderBeforeColor.java
index e673c9aca3255844d365cd05b4326408233e073b..6fa55c08d1c409bc1f05a7379c40d0fb8d0949d1 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeColor.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeColor.java
@@ -51,10 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBeforeColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java b/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java
index 6bd7557fe9dfe2997492abd99b7d8cb94d1e1c2a..071b0bf56c75e034d3042fc36d275c3abc0f9777 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PrecedenceCommon;
 
 public class BorderBeforePrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeStyle.java b/src/org/apache/fop/fo/properties/BorderBeforeStyle.java
index 4a6db73a0dde398eca036950200f94ab2e5b7a5e..e40bef4e3ab0f2d7d94b1e52ccd0ea692a1f277a 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderBeforeStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
index 9da900606e9bdc1d67bd2dc28485ea6a284e2941..de5ea2c66bdf9edd8e78513fe32e5849b9844949 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java
@@ -52,11 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBeforeWidth extends BorderCommonWidth {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java
index 3620b9ba97b0ccc3394140d8a9a6a7b735759d65..3f6bd5fb42b7f7179b943387f2d77e35f66a45cf 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBeforeWidthConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
index c260f82c224f384122e69ac4da81d718905cdf25..131f39f9ea7b4f66510037eb0e44e30190533864 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java
@@ -51,10 +51,9 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBeforeWidthLength extends BorderCommonWidth  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/BorderBottom.java b/src/org/apache/fop/fo/properties/BorderBottom.java
index e5dfa48c84744d5f60c50d1abeefc081ea0e6291..82378d292ad658659334e95c382713058877acde 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBottom.java
+++ b/src/org/apache/fop/fo/properties/BorderBottom.java
@@ -51,15 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBottom extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderBottomColor.java b/src/org/apache/fop/fo/properties/BorderBottomColor.java
index a33e9ff63c5ec25c00c9533b1f9cf70e86afe223..0d33c4e1ec7d95e52a00435c0ce18b0f5d6173be 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBottomColor.java
+++ b/src/org/apache/fop/fo/properties/BorderBottomColor.java
@@ -51,10 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBottomColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderBottomStyle.java b/src/org/apache/fop/fo/properties/BorderBottomStyle.java
index ada98a8486ef695adca1eb76fbfc7c59228ac262..64cb382e2f22690f4f49e1866f8e13f4ade5c084 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBottomStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderBottomStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderBottomStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderBottomWidth.java b/src/org/apache/fop/fo/properties/BorderBottomWidth.java
index 300a3a29dd8062ea65fbc4b703ce6b3d3c660adf..fa4b1bc1778b06d61e7659c1163286a4938faf1e 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderBottomWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderBottomWidth.java
@@ -52,11 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderBottomWidth extends BorderCommonWidth {
     public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderCollapse.java b/src/org/apache/fop/fo/properties/BorderCollapse.java
index aabaa8890dffbbc8bd9ae39cd25ea4eec19727f3..a35e217db5d1c99b38e1e9256dafa4f841413431 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderCollapse.java
+++ b/src/org/apache/fop/fo/properties/BorderCollapse.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderCollapse extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderColor.java b/src/org/apache/fop/fo/properties/BorderColor.java
index f3388a0f11ef736e218e5f111710883cf5f97e5a..79548d255a732d1ff65118bf59ed81f622622390 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderColor.java
+++ b/src/org/apache/fop/fo/properties/BorderColor.java
@@ -51,16 +51,15 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-
-import java.util.Map;
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderColor extends ColorTransparent {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderCommonStyle.java b/src/org/apache/fop/fo/properties/BorderCommonStyle.java
index d74f6d5f01322106336b993a3ec630c1d27370ce..0cdff0c9a864847cb4d8b9e79e3235425d607d6b 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderCommonStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderCommonStyle.java
@@ -51,12 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datatypes.Ints;
-
 import java.util.HashMap;
 
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
+
 /**
  * Pseudo-property class for common border style values occurring in a
  * number of classes.

diff --git a/src/org/apache/fop/fo/properties/BorderCommonWidth.java b/src/org/apache/fop/fo/properties/BorderCommonWidth.java
index fd51d42b092bf870e51e1ece77b49ade33a0e22d..c8cc74a1c9d0a730e9e75becffec94d5972de60f 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderCommonWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderCommonWidth.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.Property;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.FONode;

diff --git a/src/org/apache/fop/fo/properties/BorderEndColor.java b/src/org/apache/fop/fo/properties/BorderEndColor.java
index 3554cb0d6afe35e66472bfc9497c92b67d9b072a..6dee2414b5a3216f876e8492b713af5edbd74361 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndColor.java
+++ b/src/org/apache/fop/fo/properties/BorderEndColor.java
@@ -51,10 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderEndColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderEndPrecedence.java b/src/org/apache/fop/fo/properties/BorderEndPrecedence.java
index 334e4a390d6f7c255f56fc7a1d91cb8a5654d4f5..e4b601f3ab3586b46ec92e78701fd611462176ef 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndPrecedence.java
+++ b/src/org/apache/fop/fo/properties/BorderEndPrecedence.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PrecedenceCommon;
 
 public class BorderEndPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderEndStyle.java b/src/org/apache/fop/fo/properties/BorderEndStyle.java
index ba67b5307dd4ef46a8dbef39987c5c46ae7f727d..b75b537705567669070939624c2fb98becbdd708 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderEndStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderEndStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderEndWidth.java b/src/org/apache/fop/fo/properties/BorderEndWidth.java
index 28b7b32aa39d332f61fdc17e3e2ecfad97d4f691..3c0a9d1d3943ac1868b421ace34931410604da92 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderEndWidth.java
@@ -51,12 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderEndWidth extends BorderCommonWidth {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java
index 7f84cd7576f31339e11ff2718d32d63a70d478b5..9d72ab8aa4558d630d48fa1d5c9b2393ce14b6fd 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java
+++ b/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderEndWidthConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
index a4ddc513262181d218b8a4c06ab0e3aed7e74369..e1bab7d573d5b25aa28df1ee779dcef4fd545f37 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java
@@ -51,10 +51,9 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderEndWidthLength extends BorderCommonWidth  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/BorderLeft.java b/src/org/apache/fop/fo/properties/BorderLeft.java
index 1e1dad9ccf65f35f8bd7f09e699f4b1e2ff7e855..d94e987dc45d8469c1ea73925f982131b2afd6a6 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderLeft.java
+++ b/src/org/apache/fop/fo/properties/BorderLeft.java
@@ -51,15 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderLeft extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderLeftColor.java b/src/org/apache/fop/fo/properties/BorderLeftColor.java
index 8896f145a9dfefd05f5c6d72dcd8f0dd4d433260..09488f9deefdf7582b4a870f00cea54e1b6c78d6 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderLeftColor.java
+++ b/src/org/apache/fop/fo/properties/BorderLeftColor.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorTransparent;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderLeftColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderLeftStyle.java b/src/org/apache/fop/fo/properties/BorderLeftStyle.java
index 7aaf4f2dc321ba5f440289aa6b91f92cd36edc7b..632b5eef0c3dffbd990d82526d19d6e032ed2800 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderLeftStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderLeftStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderLeftStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderLeftWidth.java b/src/org/apache/fop/fo/properties/BorderLeftWidth.java
index df76acf63a276751134c4b5e8aebf6d4fff9dc51..2be18a3135569ae6f2ede237d88f27c68e3a4301 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderLeftWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderLeftWidth.java
@@ -52,11 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderLeftWidth extends BorderCommonWidth {
     public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderRight.java b/src/org/apache/fop/fo/properties/BorderRight.java
index 34e7448126750aa10866dc3e7a0c2f2294a9e6da..80e2e3cefc373debfa604c629010b9dc56be2cfb 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderRight.java
+++ b/src/org/apache/fop/fo/properties/BorderRight.java
@@ -51,15 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderRight extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderRightColor.java b/src/org/apache/fop/fo/properties/BorderRightColor.java
index a71053e9ddc0fd958718f27eba0fb14e4cfd9de3..8e04123acbc240cd31ba58dddf700352e79cc5bf 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderRightColor.java
+++ b/src/org/apache/fop/fo/properties/BorderRightColor.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorTransparent;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderRightColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderRightStyle.java b/src/org/apache/fop/fo/properties/BorderRightStyle.java
index 38c694215a89e49e4b1d8039209824d1ab0f68e4..361078ef6319eee706dfa1876c402d3b901d7f96 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderRightStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderRightStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderRightStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderRightWidth.java b/src/org/apache/fop/fo/properties/BorderRightWidth.java
index 43f6809b34282d55cc9aa5e2271ceb1d834f6ce0..9d1ec75d9ac111befa6ccbf828406f6c88c867fd 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderRightWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderRightWidth.java
@@ -52,11 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderRightWidth extends BorderCommonWidth {
     public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderSeparation.java b/src/org/apache/fop/fo/properties/BorderSeparation.java
index d6ac1a4aed13049e49af0fb043f933dfa593a117..2687440e7fd713994143b7faa7f4d9bcefe12747 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderSeparation.java
+++ b/src/org/apache/fop/fo/properties/BorderSeparation.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class BorderSeparation extends Property  {
     public static final int dataTypes = COMPOUND | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java b/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java
index 4f3a823df0788b6b2577ae5f81d3f810aa5f4e9c..c68a0b287256c7c72502a75e7753baef70120927 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java
+++ b/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderSeparationBlockProgressionDirection
                                                     extends Property {

diff --git a/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java b/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java
index 46c73014db506cf5430bdfc90c58aa5d60c9f508..538e0bb373c6aa219cb6e4ffdcf0d7c04ec035e7 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java
+++ b/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderSeparationInlineProgressionDirection
                                                     extends Property {

diff --git a/src/org/apache/fop/fo/properties/BorderSpacing.java b/src/org/apache/fop/fo/properties/BorderSpacing.java
index fd3521d68a91df7c1588a5a38b6e50b8a14e5333..74190309be026994787c8ab1a7fd3f5c54cafc64 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderSpacing.java
+++ b/src/org/apache/fop/fo/properties/BorderSpacing.java
@@ -51,15 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderSpacing extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderStartColor.java b/src/org/apache/fop/fo/properties/BorderStartColor.java
index 7cd66705d5a0508b090481e6c74f5baec490d698..24af134ef0b387f0505c369d635a91e49f4df180 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartColor.java
+++ b/src/org/apache/fop/fo/properties/BorderStartColor.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorTransparent;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderStartColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderStartPrecedence.java b/src/org/apache/fop/fo/properties/BorderStartPrecedence.java
index 56fa2abaac21cdbaaaf1a0167abb026768aedc00..03ed718db5bb9db02f43209bf443289830d3b01e 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartPrecedence.java
+++ b/src/org/apache/fop/fo/properties/BorderStartPrecedence.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PrecedenceCommon;
 
 public class BorderStartPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderStartStyle.java b/src/org/apache/fop/fo/properties/BorderStartStyle.java
index 8ddb2ff4bdabaf6b6fc4a5fc049c1e467ead9f97..42e9266c7b64f606ed6988050e49435b0528f6f6 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderStartStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderStartStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderStartWidth.java b/src/org/apache/fop/fo/properties/BorderStartWidth.java
index 982f0b76e5dbbea4134f2b2f5225d4b094179f32..4c66b82ecf1294c6673791d15db30bb4d6ced7df 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderStartWidth.java
@@ -52,11 +52,10 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderStartWidth extends BorderCommonWidth {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java
index 5ee3b20b192873c579aae130a4686ff587037a17..b1370b44621ccb634aa707081788ec8853bd2c4f 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java
+++ b/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderStartWidthConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
index fc3eff720689306b12550071564dc3ee2bf6a007..d681ddfb713f44738cf550bb6e0ac456dce01698 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
+++ b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java
@@ -51,10 +51,9 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderStartWidthLength extends BorderCommonWidth {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/BorderStyle.java b/src/org/apache/fop/fo/properties/BorderStyle.java
index 2fe0d4e9f82cb810d4543395327daed091f6a55a..8284c1990dc9bf223b3ede57a2d3b3eda272420c 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderStyle.java
@@ -51,19 +51,16 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonStyle;
-
-import java.util.Map;
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderStyle extends BorderCommonStyle  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderTop.java b/src/org/apache/fop/fo/properties/BorderTop.java
index 1a669f3de2351952d8e0095a19a9b3e07653d7ab..1d1393b14c3579b5c20e288fbea65118a854d413 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderTop.java
+++ b/src/org/apache/fop/fo/properties/BorderTop.java
@@ -51,15 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderTop extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/BorderTopColor.java b/src/org/apache/fop/fo/properties/BorderTopColor.java
index ba911720d9f4d8daca1a4aa951a685df1b7d91e8..a1487966c745728eb160f9258da9d3919976fd11 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderTopColor.java
+++ b/src/org/apache/fop/fo/properties/BorderTopColor.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorTransparent;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderTopColor extends ColorTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderTopStyle.java b/src/org/apache/fop/fo/properties/BorderTopStyle.java
index b4ea4918d2142cc948b28b440e8a511e29586220..6f397caad4b20c7bc12867e29c223411df0cc69c 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderTopStyle.java
+++ b/src/org/apache/fop/fo/properties/BorderTopStyle.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.BorderCommonStyle;
 
 public class BorderTopStyle extends BorderCommonStyle {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderTopWidth.java b/src/org/apache/fop/fo/properties/BorderTopWidth.java
index fdf6b2cc6f587b1a6adfdf212b013d7bb3705543..4733a3b7377a7dc7072ece2dfef3241f1aa49472 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderTopWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderTopWidth.java
@@ -51,12 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.BorderCommonWidth;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderTopWidth extends BorderCommonWidth {
     public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BorderWidth.java b/src/org/apache/fop/fo/properties/BorderWidth.java
index a436f38f8fd48ecc44bf8745ddb2d2fc2f642175..6138aa5905e0328da2b7840696e98555c0f885d0 100644 (file)
--- a/src/org/apache/fop/fo/properties/BorderWidth.java
+++ b/src/org/apache/fop/fo/properties/BorderWidth.java
@@ -51,18 +51,17 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Numeric;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.MappedNumeric;
 import org.apache.fop.datatypes.NCName;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class BorderWidth extends BorderCommonWidth {
     // Below is a special case defying the general rule that shorthands do

diff --git a/src/org/apache/fop/fo/properties/Bottom.java b/src/org/apache/fop/fo/properties/Bottom.java
index a112797fceffbc7428f924158ca9cf1dae132065..ba786a058f47f3537d813ecf689bd9fa9937d18a 100644 (file)
--- a/src/org/apache/fop/fo/properties/Bottom.java
+++ b/src/org/apache/fop/fo/properties/Bottom.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Bottom extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/BreakAfter.java b/src/org/apache/fop/fo/properties/BreakAfter.java
index e7c923e06d5bb99c7b5abfe50813300538c21d19..bd003c6e229adb83abed774c16a18a92c04b93a6 100644 (file)
--- a/src/org/apache/fop/fo/properties/BreakAfter.java
+++ b/src/org/apache/fop/fo/properties/BreakAfter.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.BreakCommon;
 
 public class BreakAfter extends BreakCommon {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BreakBefore.java b/src/org/apache/fop/fo/properties/BreakBefore.java
index 18e8f983a4d8731122af001f13ebbe536628b62d..40450e35b397c47fe6d38b13bcfcdec30d9e1659 100644 (file)
--- a/src/org/apache/fop/fo/properties/BreakBefore.java
+++ b/src/org/apache/fop/fo/properties/BreakBefore.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.BreakCommon;
 
 public class BreakBefore extends BreakCommon {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/BreakCommon.java b/src/org/apache/fop/fo/properties/BreakCommon.java
index d76d323ccd8e6347c92001ed5bb39ebf3cdd6d71..8d53cd2b983f98ca4cf053310658cceb8822b3a5 100644 (file)
--- a/src/org/apache/fop/fo/properties/BreakCommon.java
+++ b/src/org/apache/fop/fo/properties/BreakCommon.java
@@ -51,12 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-
 import java.util.HashMap;
 
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
+
 public class BreakCommon extends Property  {
     public static final int COLUMN = 1;
     public static final int PAGE = 2;

diff --git a/src/org/apache/fop/fo/properties/CaptionSide.java b/src/org/apache/fop/fo/properties/CaptionSide.java
index 476954780c86be7d0311e1ec1f4a3fe836aace7f..cc9ea4a0122fb427d5bd8df0bca5829d6dd20767 100644 (file)
--- a/src/org/apache/fop/fo/properties/CaptionSide.java
+++ b/src/org/apache/fop/fo/properties/CaptionSide.java
@@ -51,17 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class CaptionSide extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/CaseName.java b/src/org/apache/fop/fo/properties/CaseName.java
index ae665eb9a35da1e16ebcdd099b6eb5340bc342c9..6a4fae7ca3c798da435e16eaa95f702a609f665f 100644 (file)
--- a/src/org/apache/fop/fo/properties/CaseName.java
+++ b/src/org/apache/fop/fo/properties/CaseName.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class CaseName extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/CaseTitle.java b/src/org/apache/fop/fo/properties/CaseTitle.java
index d0c69076674dc65b8ffaac74888539a2fce624e4..4ee843c30cf5b87e13d8224067918236ff34837f 100644 (file)
--- a/src/org/apache/fop/fo/properties/CaseTitle.java
+++ b/src/org/apache/fop/fo/properties/CaseTitle.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class CaseTitle extends Property  {
     public static final int dataTypes = STRING;

diff --git a/src/org/apache/fop/fo/properties/Character.java b/src/org/apache/fop/fo/properties/Character.java
index ed7dea4141aedded25dce037418712b6ce181715..04cd52964330c847f1c40b0d0c12ed7be6ce10b5 100644 (file)
--- a/src/org/apache/fop/fo/properties/Character.java
+++ b/src/org/apache/fop/fo/properties/Character.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Character extends Property  {
     public static final int dataTypes = CHARACTER_T;

diff --git a/src/org/apache/fop/fo/properties/Clear.java b/src/org/apache/fop/fo/properties/Clear.java
index 96e3d2a2cc1a26bef836dba1c466b3252c11357f..aa3998766f285f7833091b6e6e46f488ea3b6881 100644 (file)
--- a/src/org/apache/fop/fo/properties/Clear.java
+++ b/src/org/apache/fop/fo/properties/Clear.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Clear extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Clip.java b/src/org/apache/fop/fo/properties/Clip.java
index d1c9a36e174688c9117b227a8c696d6ae600cd2b..5f6603038d5905bfda89bddd1ef2fcf339be3fc8 100644 (file)
--- a/src/org/apache/fop/fo/properties/Clip.java
+++ b/src/org/apache/fop/fo/properties/Clip.java
@@ -51,15 +51,14 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
-
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Clip extends Property  {
     public static final int dataTypes = AUTO | COMPLEX | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Color.java b/src/org/apache/fop/fo/properties/Color.java
index 667656ba28059d0ab74fd110e02bf7f333d446ba..04b066d7dee845cdd08266b5ad0c9a5360c08d7a 100644 (file)
--- a/src/org/apache/fop/fo/properties/Color.java
+++ b/src/org/apache/fop/fo/properties/Color.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorNonTransparent;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Color extends ColorNonTransparent {
     public static final int dataTypes = ENUM | COLOR_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ColorCommon.java b/src/org/apache/fop/fo/properties/ColorCommon.java
index 85edf127f8b8cb5a7c1ed98d831a448ee6203c3b..ae47a7dcf3d8a1268a9391a394b228c77a9c4ade 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorCommon.java
+++ b/src/org/apache/fop/fo/properties/ColorCommon.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.messaging.MessageHandler;
 
 /**

diff --git a/src/org/apache/fop/fo/properties/ColorNonTransparent.java b/src/org/apache/fop/fo/properties/ColorNonTransparent.java
index 2c6587d245ee68793cdbc8a7c4d33358b60b7089..77f8efd3ee3a7e4b6f55b870a1483f4ceae30154 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorNonTransparent.java
+++ b/src/org/apache/fop/fo/properties/ColorNonTransparent.java
@@ -51,13 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.ColorCommon;
-
 import java.util.HashMap;
 
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
+
 /**
  * Pseudo-property class for common color values occurring in a
  * number of classes.

diff --git a/src/org/apache/fop/fo/properties/ColorProfileName.java b/src/org/apache/fop/fo/properties/ColorProfileName.java
index 598f3a946490b917090d6f8da8f3456e8bed311e..533b2a1a1c444fd0acb151205462605fa33af867 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorProfileName.java
+++ b/src/org/apache/fop/fo/properties/ColorProfileName.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ColorProfileName extends Property  {
     public static final int dataTypes = NCNAME | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ColorTransparent.java b/src/org/apache/fop/fo/properties/ColorTransparent.java
index b77896252619c9b15adc740327d0530a79cf93fd..37ed1d5538318e7968dc0906a2b756f27852e2a7 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColorTransparent.java
+++ b/src/org/apache/fop/fo/properties/ColorTransparent.java
@@ -51,13 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.ColorCommon;
-
 import java.util.HashMap;
 
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
+
 /**
  * Pseudo-property class for common color values, and the special value
  * "transparent", occurring in a number of classes.

diff --git a/src/org/apache/fop/fo/properties/ColumnCount.java b/src/org/apache/fop/fo/properties/ColumnCount.java
index 113942d1d3b6e58ec05098874a45106d87e8cb1a..78b50cccf32d57b035e2522a794b899a60bf35f7 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColumnCount.java
+++ b/src/org/apache/fop/fo/properties/ColumnCount.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ColumnCount extends Property  {
     public static final int dataTypes = NUMBER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ColumnGap.java b/src/org/apache/fop/fo/properties/ColumnGap.java
index 8e62863a86f68dc1a7ceddcd715585ee452a466c..2074a2da6e2eb556b0e461b8c150853cffdba118 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColumnGap.java
+++ b/src/org/apache/fop/fo/properties/ColumnGap.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ColumnGap extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ColumnNumber.java b/src/org/apache/fop/fo/properties/ColumnNumber.java
index 0f246da76cb8ca41bd63f2b1d09c384b8e09a14e..80991b8ffb695df73437f6f893c59619839758e5 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColumnNumber.java
+++ b/src/org/apache/fop/fo/properties/ColumnNumber.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ColumnNumber extends Property  {
     public static final int dataTypes = NUMBER;

diff --git a/src/org/apache/fop/fo/properties/ColumnWidth.java b/src/org/apache/fop/fo/properties/ColumnWidth.java
index 88b524482bba971422a0dd4279e8b5c2ef3a9aec..441435e4ca66912f0a08516cbb989c8fd9aad465 100644 (file)
--- a/src/org/apache/fop/fo/properties/ColumnWidth.java
+++ b/src/org/apache/fop/fo/properties/ColumnWidth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ColumnWidth extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH;

diff --git a/src/org/apache/fop/fo/properties/Conditionality.java b/src/org/apache/fop/fo/properties/Conditionality.java
index 519d9af7e6e88d6a3574ea31c3d4a4832cbc498b..4b4f248c6a86d7dc0d30ba3a1c66063ef8016062 100644 (file)
--- a/src/org/apache/fop/fo/properties/Conditionality.java
+++ b/src/org/apache/fop/fo/properties/Conditionality.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class Conditionality extends Property  {
     public static final int DISCARD = 1;

diff --git a/src/org/apache/fop/fo/properties/ContentDimension.java b/src/org/apache/fop/fo/properties/ContentDimension.java
index 5cafa795c62618aeb3540b9b3d4c0c555ce404bf..47828c9467c67869cd8ed552c09d28ab3be94c94 100644 (file)
--- a/src/org/apache/fop/fo/properties/ContentDimension.java
+++ b/src/org/apache/fop/fo/properties/ContentDimension.java
@@ -52,7 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ContentDimension extends Property  {
     public static final int SCALE_TO_FIT = 1;

diff --git a/src/org/apache/fop/fo/properties/ContentHeight.java b/src/org/apache/fop/fo/properties/ContentHeight.java
index e0fca3a6519316e72232acfae7b74c8ac6d73ef8..64731827899c6b546f2d8208a0d6873e0be5ee17 100644 (file)
--- a/src/org/apache/fop/fo/properties/ContentHeight.java
+++ b/src/org/apache/fop/fo/properties/ContentHeight.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.ContentDimension;
 
 public class ContentHeight extends ContentDimension  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/ContentType.java b/src/org/apache/fop/fo/properties/ContentType.java
index 73af8eac04f6b5b2c24190d35701f8ca1432b0e3..0e747dc7b6bd076b46ad9e36debaaa2574158b84 100644 (file)
--- a/src/org/apache/fop/fo/properties/ContentType.java
+++ b/src/org/apache/fop/fo/properties/ContentType.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ContentType extends Property  {
     public static final int dataTypes = NCNAME | MIMETYPE | AUTO;

diff --git a/src/org/apache/fop/fo/properties/ContentWidth.java b/src/org/apache/fop/fo/properties/ContentWidth.java
index 17e3a551700bbb132623d91ce96a6301c0de2eb7..e771c40c7a7f4100300aa282c96f0461dae69107 100644 (file)
--- a/src/org/apache/fop/fo/properties/ContentWidth.java
+++ b/src/org/apache/fop/fo/properties/ContentWidth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.ContentDimension;
 
 public class ContentWidth extends ContentDimension  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/Country.java b/src/org/apache/fop/fo/properties/Country.java
index b1610a61b950562d359123857c73c415b03aabe5..f2f6938c8d70bbe3269c80ed94eda94defa59593 100644 (file)
--- a/src/org/apache/fop/fo/properties/Country.java
+++ b/src/org/apache/fop/fo/properties/Country.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Country extends Property  {
     public static final int dataTypes = COUNTRY_T | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Cue.java b/src/org/apache/fop/fo/properties/Cue.java
index ef13a4426916817cda632f41c6251d1a4dfce0d9..6031e494cd4e43f512aad27d1a79545298f476cd 100644 (file)
--- a/src/org/apache/fop/fo/properties/Cue.java
+++ b/src/org/apache/fop/fo/properties/Cue.java
@@ -51,13 +51,12 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Cue extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/CueAfter.java b/src/org/apache/fop/fo/properties/CueAfter.java
index 39f342f8a8f8356935be5986cc52303330225933..aaaaa4eda01ceccab603d6010da80bd650557e04 100644 (file)
--- a/src/org/apache/fop/fo/properties/CueAfter.java
+++ b/src/org/apache/fop/fo/properties/CueAfter.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class CueAfter extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/CueBefore.java b/src/org/apache/fop/fo/properties/CueBefore.java
index c809eed4b2759ed8733ff6083c78fe3d59e1b789..d20c960db670b5b1a8c69030322440501bf9f2a9 100644 (file)
--- a/src/org/apache/fop/fo/properties/CueBefore.java
+++ b/src/org/apache/fop/fo/properties/CueBefore.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class CueBefore extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java b/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java
index 18f6373a799d35ad1866150e7fea55821966fe1a..2fc46b890cbe7315d255b81185f7b0d60206f973 100644 (file)
--- a/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java
+++ b/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class DestinationPlacementOffset extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/Direction.java b/src/org/apache/fop/fo/properties/Direction.java
index fba982ca88171c2270a45c274f788aec11592a49..4d0c4e9396495a130e9d75e71755f152766faa6c 100644 (file)
--- a/src/org/apache/fop/fo/properties/Direction.java
+++ b/src/org/apache/fop/fo/properties/Direction.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Direction extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/DisplayAlign.java b/src/org/apache/fop/fo/properties/DisplayAlign.java
index 11924e022e189959656010b4c5e0f034db83ec1f..cee0dee5444111f101ebfdf16cc2ab68329f8681 100644 (file)
--- a/src/org/apache/fop/fo/properties/DisplayAlign.java
+++ b/src/org/apache/fop/fo/properties/DisplayAlign.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class DisplayAlign extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/DominantBaseline.java b/src/org/apache/fop/fo/properties/DominantBaseline.java
index 05e6e271c6c6df9de9581fcc0d658d68f2026bda..df1081f89b393e6a882b774cb48c068ed5a4687f 100644 (file)
--- a/src/org/apache/fop/fo/properties/DominantBaseline.java
+++ b/src/org/apache/fop/fo/properties/DominantBaseline.java
@@ -51,13 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class DominantBaseline extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Dummy.java b/src/org/apache/fop/fo/properties/Dummy.java
index 81575f5d70d84078188e30a0bf432ef7155ed664..3a5eb667340a93234e979739720b2f3066d54f1c 100644 (file)
--- a/src/org/apache/fop/fo/properties/Dummy.java
+++ b/src/org/apache/fop/fo/properties/Dummy.java
@@ -1,5 +1,6 @@
 package org.apache.fop.fo.properties;
 
+
 import org.apache.fop.fo.properties.AbsolutePosition;
 import org.apache.fop.fo.properties.ActiveState;
 import org.apache.fop.fo.properties.AlignmentAdjust;

diff --git a/src/org/apache/fop/fo/properties/Elevation.java b/src/org/apache/fop/fo/properties/Elevation.java
index ec7f813ddf3aaa4260749d8c7de7b2bfcd5d2bb8..66a948dd8f31c4c1e767435fb658dbfd70186936 100644 (file)
--- a/src/org/apache/fop/fo/properties/Elevation.java
+++ b/src/org/apache/fop/fo/properties/Elevation.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Elevation extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/EmptyCells.java b/src/org/apache/fop/fo/properties/EmptyCells.java
index 7177a625731b3289f0dbbe3d03377bedaa99f1d8..7064fdde5d18494f2391a6332698d0029457c230 100644 (file)
--- a/src/org/apache/fop/fo/properties/EmptyCells.java
+++ b/src/org/apache/fop/fo/properties/EmptyCells.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class EmptyCells extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/EndIndent.java b/src/org/apache/fop/fo/properties/EndIndent.java
index e69fd6768f366563f3d1a7a27bda540428902fed..a95ab6ef7c9cf48b08262a79c093d67da27fa7bf 100644 (file)
--- a/src/org/apache/fop/fo/properties/EndIndent.java
+++ b/src/org/apache/fop/fo/properties/EndIndent.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class EndIndent extends Property  {
     public static final int dataTypes = LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/EndsRow.java b/src/org/apache/fop/fo/properties/EndsRow.java
index 181f7f742f649ffe141562d0b1a573d6aedf7d0f..68fdd1b19ada72a6c62908e49e9769e42cc9e70d 100644 (file)
--- a/src/org/apache/fop/fo/properties/EndsRow.java
+++ b/src/org/apache/fop/fo/properties/EndsRow.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class EndsRow extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/Extent.java b/src/org/apache/fop/fo/properties/Extent.java
index 6b8304a600385ee22980adbf834661929ec6d69a..fb898225683ebfa0562e341f24f069fb0a5581fd 100644 (file)
--- a/src/org/apache/fop/fo/properties/Extent.java
+++ b/src/org/apache/fop/fo/properties/Extent.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Extent extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ExternalDestination.java b/src/org/apache/fop/fo/properties/ExternalDestination.java
index 9a6697d3ce34c4c976ba8dcac233cade7e35748d..4081ea3a6635f33b4a00c8d8081817b49f7f0ce7 100644 (file)
--- a/src/org/apache/fop/fo/properties/ExternalDestination.java
+++ b/src/org/apache/fop/fo/properties/ExternalDestination.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.UriType;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ExternalDestination extends Property  {
     public static final int dataTypes = URI_SPECIFICATION;

diff --git a/src/org/apache/fop/fo/properties/Float.java b/src/org/apache/fop/fo/properties/Float.java
index 5fcdd0c27bd978ff1bd946d0c833a6a3fbbb7ab7..f3f5833762e6eec5a2efa9c8743b308dfb2318e4 100644 (file)
--- a/src/org/apache/fop/fo/properties/Float.java
+++ b/src/org/apache/fop/fo/properties/Float.java
@@ -51,13 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Float extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FlowName.java b/src/org/apache/fop/fo/properties/FlowName.java
index e3f5411570e256a7702d07710866cda3fc2d7e28..7e53326652a35dae5fbd2536d6898b952ec901fd 100644 (file)
--- a/src/org/apache/fop/fo/properties/FlowName.java
+++ b/src/org/apache/fop/fo/properties/FlowName.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FlowName extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/Font.java b/src/org/apache/fop/fo/properties/Font.java
index f996068834b6b272afe7a7057789e1924fdb8c96..fe61897d59b21890eb6f09b9e7700f6a52a9badb 100644 (file)
--- a/src/org/apache/fop/fo/properties/Font.java
+++ b/src/org/apache/fop/fo/properties/Font.java
@@ -51,33 +51,24 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.NCName;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.MappedNumeric;
-import org.apache.fop.datatypes.Ems;
-import org.apache.fop.datatypes.IntegerType;
-import org.apache.fop.datatypes.StringType;
 import org.apache.fop.datatypes.FontFamilySet;
 import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.expr.SystemFontFunction;
+import org.apache.fop.datatypes.MappedNumeric;
+import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.expr.SystemFontFunction;
 import org.apache.fop.messaging.MessageHandler;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-
 public class Font extends Property  {
     public static final int dataTypes = SHORTHAND;
     public static final int traitMapping = SHORTHAND_MAP;

diff --git a/src/org/apache/fop/fo/properties/FontFamily.java b/src/org/apache/fop/fo/properties/FontFamily.java
index 3d8df6a6f82bff1ceb3934fc05a0b7efed4aff47..99b03e3a15547921ab23d9c5334b85b126c1402c 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontFamily.java
+++ b/src/org/apache/fop/fo/properties/FontFamily.java
@@ -51,21 +51,17 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.FontFamilySet;
-import org.apache.fop.datatypes.StringType;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.datatypes.StringType;
 import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontFamily extends Property  {
     public static final int dataTypes = COMPLEX | INHERIT | FONTSET;

diff --git a/src/org/apache/fop/fo/properties/FontSelectionStrategy.java b/src/org/apache/fop/fo/properties/FontSelectionStrategy.java
index fd38f7c3e1c2539113ccd21b58b8e6803210a2ce..ec89b38546e56cf19a56913d1b5cbf5a97758fc5 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontSelectionStrategy.java
+++ b/src/org/apache/fop/fo/properties/FontSelectionStrategy.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class FontSelectionStrategy extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FontSize.java b/src/org/apache/fop/fo/properties/FontSize.java
index e17383054f96431a1bb5737e153771c0682bd8f8..a28b28dc3a8d088055cdfe9f0cfc350850b00b19 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontSize.java
+++ b/src/org/apache/fop/fo/properties/FontSize.java
@@ -51,21 +51,16 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Numeric;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.Ems;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontSize extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/FontSizeAdjust.java b/src/org/apache/fop/fo/properties/FontSizeAdjust.java
index 3ff1e3436571dc422eb80002f2cd201224ac2dd2..9e778f548fa14c3240878e8275b1ef65a62209ef 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontSizeAdjust.java
+++ b/src/org/apache/fop/fo/properties/FontSizeAdjust.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class FontSizeAdjust extends Property  {
     public static final int dataTypes = NUMBER | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FontStretch.java b/src/org/apache/fop/fo/properties/FontStretch.java
index 60a81d7a3692fb78a7fb6ec96f3fa74349d23e86..c70a348e2ba882b5971fcee8768c762e6dd90036 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontStretch.java
+++ b/src/org/apache/fop/fo/properties/FontStretch.java
@@ -51,17 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontStretch extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FontStyle.java b/src/org/apache/fop/fo/properties/FontStyle.java
index 26c96618f0e3de37092359200285de37d6775a27..4f79c62f4be45962424e467533ff121deb73128f 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontStyle.java
+++ b/src/org/apache/fop/fo/properties/FontStyle.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontStyle extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FontVariant.java b/src/org/apache/fop/fo/properties/FontVariant.java
index 12cda383832ef2e336c299a4c089a25f27a8f46d..48cc03b83c0066cff1ba91064790a05f8b440366 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontVariant.java
+++ b/src/org/apache/fop/fo/properties/FontVariant.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontVariant extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/FontWeight.java b/src/org/apache/fop/fo/properties/FontWeight.java
index 6413f763c2dcece4d93aa101d52acb4bd835166e..1de0dcfc551f20b083f966331e22d22231a7b83d 100644 (file)
--- a/src/org/apache/fop/fo/properties/FontWeight.java
+++ b/src/org/apache/fop/fo/properties/FontWeight.java
@@ -51,13 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class FontWeight extends Property  {
     public static final int dataTypes = INTEGER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ForcePageCount.java b/src/org/apache/fop/fo/properties/ForcePageCount.java
index fb6b3493a39834dff102170b07fde97663d68b15..ac8d820f1b925e0add754a933e28f309e3c87907 100644 (file)
--- a/src/org/apache/fop/fo/properties/ForcePageCount.java
+++ b/src/org/apache/fop/fo/properties/ForcePageCount.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ForcePageCount extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Format.java b/src/org/apache/fop/fo/properties/Format.java
index edabc952aa7ed279c8ebbf8bcf1dda350e94c3d5..339691cefc78bfc792ecb2f3d4657345138b8c61 100644 (file)
--- a/src/org/apache/fop/fo/properties/Format.java
+++ b/src/org/apache/fop/fo/properties/Format.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Literal;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Format extends Property  {
     public static final int dataTypes = STRING;

diff --git a/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java b/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java
index 3e9fe0e50e481cd520dccd6f6e8cc73f00975ef1..9ba161d8de8bef50fcb5c10f3bddeb12453d4be4 100644 (file)
--- a/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java
+++ b/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Angle;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class GlyphOrientationHorizontal extends Property  {
     public static final int dataTypes = ANGLE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java b/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java
index 316b2239747d5f4d71a73842c988c5007d15e5da..899505bf0f7ff45c054e27620e87ebc3fb7e1411 100644 (file)
--- a/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java
+++ b/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class GlyphOrientationVertical extends Property  {
     public static final int dataTypes = ANGLE | AUTO | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/GroupingSeparator.java b/src/org/apache/fop/fo/properties/GroupingSeparator.java
index 9964b465a269a0ee35260822ce9599b16b9a8270..8546663193034bdc4952ad274a4b6b9e2e1d13a9 100644 (file)
--- a/src/org/apache/fop/fo/properties/GroupingSeparator.java
+++ b/src/org/apache/fop/fo/properties/GroupingSeparator.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class GroupingSeparator extends Property  {
     public static final int dataTypes = CHARACTER_T;

diff --git a/src/org/apache/fop/fo/properties/GroupingSize.java b/src/org/apache/fop/fo/properties/GroupingSize.java
index 4fac199508bbe64d00d55973413e0ba0e392b5ea..ad6c5f791c26d79742252f3cedaf8681c642ac35 100644 (file)
--- a/src/org/apache/fop/fo/properties/GroupingSize.java
+++ b/src/org/apache/fop/fo/properties/GroupingSize.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class GroupingSize extends Property  {
     public static final int dataTypes = NUMBER;

diff --git a/src/org/apache/fop/fo/properties/Height.java b/src/org/apache/fop/fo/properties/Height.java
index 0f3ee9963dac6ce59dddb4f22fe93e2d27f30cef..3c0818b899bd28061c967889f5f843b35df8f5d2 100644 (file)
--- a/src/org/apache/fop/fo/properties/Height.java
+++ b/src/org/apache/fop/fo/properties/Height.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Height extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/Hyphenate.java b/src/org/apache/fop/fo/properties/Hyphenate.java
index 4f6ae280048123c66c6df3c4b99f30c46a9d45a9..dc7f35178e1455751e88b33289d90db451fb337b 100644 (file)
--- a/src/org/apache/fop/fo/properties/Hyphenate.java
+++ b/src/org/apache/fop/fo/properties/Hyphenate.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Hyphenate extends Property  {
     public static final int dataTypes = BOOL | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/HyphenationCharacter.java b/src/org/apache/fop/fo/properties/HyphenationCharacter.java
index 13a1648132540c1f2fb027cfc3e6e0cdd0aef5dd..ac1708779c6819ec6462cc8aa02824e1f2a50133 100644 (file)
--- a/src/org/apache/fop/fo/properties/HyphenationCharacter.java
+++ b/src/org/apache/fop/fo/properties/HyphenationCharacter.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Literal;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class HyphenationCharacter extends Property  {
     public static final int dataTypes = CHARACTER_T | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/HyphenationKeep.java b/src/org/apache/fop/fo/properties/HyphenationKeep.java
index e56f82e6de627a3c474d062d839583401df7c5f7..81137ad1d82f7f60c5a973f706cf06caeb6c163e 100644 (file)
--- a/src/org/apache/fop/fo/properties/HyphenationKeep.java
+++ b/src/org/apache/fop/fo/properties/HyphenationKeep.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class HyphenationKeep extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/HyphenationLadderCount.java b/src/org/apache/fop/fo/properties/HyphenationLadderCount.java
index 4e58712433bde931cae407fa882c48b7553aac09..311af63efd11ff2067aeac4b95e2d707b4cf4e46 100644 (file)
--- a/src/org/apache/fop/fo/properties/HyphenationLadderCount.java
+++ b/src/org/apache/fop/fo/properties/HyphenationLadderCount.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class HyphenationLadderCount extends Property  {
     public static final int dataTypes = NUMBER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java b/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java
index ac8900d44ef8a31b988eee86223d297b394462b8..157f0631bb702c9ed83de66264f98c9f1af206d4 100644 (file)
--- a/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java
+++ b/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java
@@ -52,10 +52,9 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class HyphenationPushCharacterCount extends Property  {
     public static final int dataTypes = NUMBER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java b/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java
index 01fe31ee2a00540cb7945db290e3aec098439d11..ca49158fc42d80158bf06574f4dc8f85bb699a57 100644 (file)
--- a/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java
+++ b/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java
@@ -52,10 +52,9 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class HyphenationRemainCharacterCount extends Property  {
     public static final int dataTypes = NUMBER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Id.java b/src/org/apache/fop/fo/properties/Id.java
index 28f0dbe663a87fd74ccbdb0b8bd5d55fd2b3724d..ff3240915354acffb312d4d7230b272e0dc6cd99 100644 (file)
--- a/src/org/apache/fop/fo/properties/Id.java
+++ b/src/org/apache/fop/fo/properties/Id.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Id extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/IndicateDestination.java b/src/org/apache/fop/fo/properties/IndicateDestination.java
index 01484e6a78813c8e04d2d5f3617fab338d075500..f8d022eb244b6bac1826b796ead3a41b5d896f8a 100644 (file)
--- a/src/org/apache/fop/fo/properties/IndicateDestination.java
+++ b/src/org/apache/fop/fo/properties/IndicateDestination.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class IndicateDestination extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/InitialPageNumber.java b/src/org/apache/fop/fo/properties/InitialPageNumber.java
index 1b8a2b7ee7a08074482e4d21609ae3d06c8918eb..39c6dabd56ceda73982f5295ee117acf968bb9b3 100644 (file)
--- a/src/org/apache/fop/fo/properties/InitialPageNumber.java
+++ b/src/org/apache/fop/fo/properties/InitialPageNumber.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class InitialPageNumber extends Property  {
     public static final int dataTypes = NUMBER | AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimension.java b/src/org/apache/fop/fo/properties/InlineProgressionDimension.java
index 3c9d0331f819c7b6e0cc10d5e7dcf0d80d584a2d..7255ab9d5975c899c819528e92e9e1892e961489 100644 (file)
--- a/src/org/apache/fop/fo/properties/InlineProgressionDimension.java
+++ b/src/org/apache/fop/fo/properties/InlineProgressionDimension.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class InlineProgressionDimension extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java
index 09d59f9cfccef9d23240fa784f9ace8aa224c0a4..b4ca3b9996dec67d9643d1e7e68858863cd5c3cb 100644 (file)
--- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java
+++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class InlineProgressionDimensionMaximum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java
index c586112e2d95384011ce4b42a9d803d479bd5e99..bf5f26226d4b365f9f8f4fab95dc3b1bea40c58e 100644 (file)
--- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java
+++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class InlineProgressionDimensionMinimum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java
index 4eba1dd8777843c3739a152671744f972fbaeb4f..38183e5c85be10ad110ca129a6c285af82a79eee 100644 (file)
--- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java
+++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class InlineProgressionDimensionOptimum extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | AUTO;

diff --git a/src/org/apache/fop/fo/properties/InternalDestination.java b/src/org/apache/fop/fo/properties/InternalDestination.java
index 156fd666f73627d66b433da3925de330662de0b3..90712fdf41d3f7bae36bd20fb4b4c42702dfc452 100644 (file)
--- a/src/org/apache/fop/fo/properties/InternalDestination.java
+++ b/src/org/apache/fop/fo/properties/InternalDestination.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Literal;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class InternalDestination extends Property  {
     public static final int dataTypes = LITERAL | NCNAME;

diff --git a/src/org/apache/fop/fo/properties/IntrusionDisplace.java b/src/org/apache/fop/fo/properties/IntrusionDisplace.java
index adab2af32f9ddd67bae953fa16b76b7fee9e2d6f..bded97e5a4e394583d1ab581b4cfc015f60ce61b 100644 (file)
--- a/src/org/apache/fop/fo/properties/IntrusionDisplace.java
+++ b/src/org/apache/fop/fo/properties/IntrusionDisplace.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class IntrusionDisplace extends Property  {
     public static final int dataTypes = AUTO | ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Keep.java b/src/org/apache/fop/fo/properties/Keep.java
index 3ce1445e0cb9b75f5308328ec6b429e7f3789986..eee4d4bb4b6df20b2f82e9d07e4a33b94f81e8a7 100644 (file)
--- a/src/org/apache/fop/fo/properties/Keep.java
+++ b/src/org/apache/fop/fo/properties/Keep.java
@@ -52,7 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Keep extends Property  {
 

diff --git a/src/org/apache/fop/fo/properties/KeepTogether.java b/src/org/apache/fop/fo/properties/KeepTogether.java
index 0ad3bd3bc74f2cf2c1e1bed6ff6d397b6391a3f8..fda3da43137b31ed65cca4457231e8cb399d4ccc 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepTogether.java
+++ b/src/org/apache/fop/fo/properties/KeepTogether.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepTogether extends Keep  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java
index d1e4145af9bfe0adb51b6b7a9dcca6de04428f64..ae881f9069cb99e96b7e93b94443911593f50d7a 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java
+++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepTogetherWithinColumn extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java
index d5e0c800c151f171395b7e7f38eb38d1b13c49a4..629e705b937aaae066bad75f99883bdf4cc74618 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java
+++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepTogetherWithinLine extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java
index caaa6709ba93e6480ef432f8177c83a2e2d8bec8..e9616a223e6fdb29d9824d1b63cbac719566a6b7 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java
+++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepTogetherWithinPage extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithNext.java b/src/org/apache/fop/fo/properties/KeepWithNext.java
index 2aad7ac80cc1c26b781cf255213fb09415fb4081..26b8dec7d627142f1e12efb802d9126918a42e98 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithNext.java
+++ b/src/org/apache/fop/fo/properties/KeepWithNext.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithNext extends Keep  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java
index 10382883bdd8f1ce7af62258fd1e39f8d3641e47..e83cde76e1322292c434b7932806adfbb3eb545b 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java
+++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithNextWithinColumn extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java
index 3e1c65f82a44eac7aa12252bef4719d8c9dc728e..757463559e2275fddebf6f00e3c3fc3638dd117e 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java
+++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithNextWithinLine extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java
index 27259e8f43200f8d6a9dd03e63f0e0c81b2095f5..b2618eb1f24111b835bc745f07355f3a5cdb4841 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java
+++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithNextWithinPage extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithPrevious.java b/src/org/apache/fop/fo/properties/KeepWithPrevious.java
index 8150e9244e440985bcca76013e2546aefe1c0fb0..ef69cb8fee14d00397f4c5cd445cb7d5c86cb779 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithPrevious.java
+++ b/src/org/apache/fop/fo/properties/KeepWithPrevious.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithPrevious extends Keep  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java
index 86003fa64edcae647796c3ff6bd2ba6de5738e4b..cdd3093c525350526c42b001c3df571b089e0225 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java
+++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithPreviousWithinColumn extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java
index b5c84e6272f8cd41b1a08347b6bb77142fae9e5e..db9a07f9ff31bb2933b74a3f089987f167025ee4 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java
+++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithPreviousWithinLine extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java
index 5b3fed7d7bab0f6cf346c4a42a743ddec9e3b368..df9785dc6da7e00d1e1bf0ef573538eed61e9c5b 100644 (file)
--- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java
+++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Keep;
 
 public class KeepWithPreviousWithinPage extends Keep  {
     public static final int dataTypes = AUTO | ENUM | INTEGER;

diff --git a/src/org/apache/fop/fo/properties/Language.java b/src/org/apache/fop/fo/properties/Language.java
index 86ee26bd8015e146351e0c3aa7daa89728e6dcb3..b7a4e1abd3d01e0836dea347603d0e6158a9a0ae 100644 (file)
--- a/src/org/apache/fop/fo/properties/Language.java
+++ b/src/org/apache/fop/fo/properties/Language.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Language extends Property  {
     public static final int dataTypes = LANGUAGE_T | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LastLineEndIndent.java b/src/org/apache/fop/fo/properties/LastLineEndIndent.java
index e85fa7b47f9db7b2b91cfc965f67a612168a667d..72126c2364cb00d075bb33c552c7f77285382ee7 100644 (file)
--- a/src/org/apache/fop/fo/properties/LastLineEndIndent.java
+++ b/src/org/apache/fop/fo/properties/LastLineEndIndent.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LastLineEndIndent extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LeaderAlignment.java b/src/org/apache/fop/fo/properties/LeaderAlignment.java
index 3b9a4084d0b82edd24452bf94faa0f713c00c2f6..dc5bdd72714723d2e66cb6e77618d171fa85db28 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderAlignment.java
+++ b/src/org/apache/fop/fo/properties/LeaderAlignment.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class LeaderAlignment extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LeaderLength.java b/src/org/apache/fop/fo/properties/LeaderLength.java
index 04d275af4d0b6092163e4e8dc1282670852c288c..91ce7ee907d4a70d32c26c69c62955344cd4a73a 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderLength.java
+++ b/src/org/apache/fop/fo/properties/LeaderLength.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class LeaderLength extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java b/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java
index cde03d90b9a9aa1cef4d8573780762848da39396..27bd5f5adbb5d29c33c697250293858063182812 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java
+++ b/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.Percentage;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LeaderLengthMaximum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java b/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java
index b4b1532939cd0047aca623e83b92a3d87f02202f..d82145f07100f9dc22f8070a8f034bfac638b44d 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java
+++ b/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LeaderLengthMinimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java b/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java
index 9992278e07c400359ec88d3b29841639c7fead2a..8d0a04cde8fb158f497616458ae18c02f4d01b14 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java
+++ b/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LeaderLengthOptimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LeaderPattern.java b/src/org/apache/fop/fo/properties/LeaderPattern.java
index 7e44891d5c49b89637c2f9f95277dfb3e7a978e4..f9ca680cc196908693e8f7f0a513e1e743776584 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderPattern.java
+++ b/src/org/apache/fop/fo/properties/LeaderPattern.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LeaderPattern extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LeaderPatternWidth.java b/src/org/apache/fop/fo/properties/LeaderPatternWidth.java
index 58cb3387f4057b3d10fd882659d994291a55452c..2240d01b21bc0299178073846320597c98b3ef1d 100644 (file)
--- a/src/org/apache/fop/fo/properties/LeaderPatternWidth.java
+++ b/src/org/apache/fop/fo/properties/LeaderPatternWidth.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LeaderPatternWidth extends Property  {
     public static final int dataTypes = LENGTH | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Left.java b/src/org/apache/fop/fo/properties/Left.java
index 36500dfe5df206f763d4a97ce90ceed1d88ff38e..8a11c625d401caced789a8900bb6755cd20fbc42 100644 (file)
--- a/src/org/apache/fop/fo/properties/Left.java
+++ b/src/org/apache/fop/fo/properties/Left.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Left extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/LetterSpacing.java b/src/org/apache/fop/fo/properties/LetterSpacing.java
index ec834791e0c3a888c65087aada8fe74fe5f39b0a..e65f89fcf1da57f6827e844f7ec32e2e25b2e665 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacing.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacing.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacing extends Property  {
     public static final int dataTypes = LENGTH | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java b/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java
index f9f0c386e30053dcf02ffc832a46d5b849465add..f500e993d5f171ca3ab01a43882318a0eb166378 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacingConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java b/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java
index 74d6dffccf6406418ca21ac333b66f0750b768cb..d30dfefef2e4b96415a41fdbaf49b118a6e116f8 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacingMaximum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java b/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java
index f5683f9bc56718f7db69f684cf6dfb46e2970488..a8f275fe814fd34a99fae2eb6740d663bd030d40 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacingMinimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java b/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java
index 8a33a19f368d897348956697c108b749db6f24eb..17eb9dfd40e9e56cb99472be374770e8297e474b 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacingOptimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java b/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java
index 800ca7d2de3ee0bdde5c8a666ee95aa1ae48b3b4..5c9bc23e3397702794c9ac4356a38f0487ae87c7 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java
+++ b/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LetterSpacingPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/LetterValue.java b/src/org/apache/fop/fo/properties/LetterValue.java
index 2f28a53f4b44fe2e89ddd0ac7a42db8de1d7b4aa..8bfe74bb69c71f2efbf0bf854c695224a2424583 100644 (file)
--- a/src/org/apache/fop/fo/properties/LetterValue.java
+++ b/src/org/apache/fop/fo/properties/LetterValue.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class LetterValue extends Property  {
     public static final int dataTypes = AUTO | ENUM;

diff --git a/src/org/apache/fop/fo/properties/LineHeight.java b/src/org/apache/fop/fo/properties/LineHeight.java
index 645bf9b457ef6c733dbd0edc09b5f52b0314bfce..26995f7f1241c309fe5606085a6343e2da18be5f 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeight.java
+++ b/src/org/apache/fop/fo/properties/LineHeight.java
@@ -51,13 +51,11 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Ems;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeight extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/LineHeightConditionality.java b/src/org/apache/fop/fo/properties/LineHeightConditionality.java
index 3c7715e414692a537b05f22cb7458ceacdbd6d9d..ae7d6a5e8a60322ffbe5d546f8d127c21f38dfee 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightConditionality.java
+++ b/src/org/apache/fop/fo/properties/LineHeightConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/LineHeightMaximum.java b/src/org/apache/fop/fo/properties/LineHeightMaximum.java
index 2877480f91734cd9664300429cb1c5ad5e606f06..519308fc8f99738fa3b2f7ed608377fc5f09bf8b 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightMaximum.java
+++ b/src/org/apache/fop/fo/properties/LineHeightMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Ems;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightMaximum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LineHeightMinimum.java b/src/org/apache/fop/fo/properties/LineHeightMinimum.java
index 153659ec0e1d325ef6ef74b1f536c0c8f8aa892d..a7a2c037f31458b5dcb3136bf76651679295a479 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightMinimum.java
+++ b/src/org/apache/fop/fo/properties/LineHeightMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Ems;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightMinimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LineHeightOptimum.java b/src/org/apache/fop/fo/properties/LineHeightOptimum.java
index 83d99b5c6f089a87a237870c73cb1f6acde9441a..2075e8c4234c7f92707e15ce3c7e0a52b4026f5d 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightOptimum.java
+++ b/src/org/apache/fop/fo/properties/LineHeightOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Ems;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightOptimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/LineHeightPrecedence.java b/src/org/apache/fop/fo/properties/LineHeightPrecedence.java
index c040dae045abe6295b9ae2f9bb7fa436a8e1a64f..f642acb0749d15835aad3a6ef0bf9ec7de508159 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightPrecedence.java
+++ b/src/org/apache/fop/fo/properties/LineHeightPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java b/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java
index adfb7fa41a18dd4c0cbde8f3e40002480d6f1112..8e359c73f4dbbe126717283a04a301245e7f88c4 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java
+++ b/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineHeightShiftAdjustment extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LineStackingStrategy.java b/src/org/apache/fop/fo/properties/LineStackingStrategy.java
index 3a30c7f476da8382e034565ecbc7362342f29065..41370afadf65c92d0c8dec2385db7f58bfb91a5f 100644 (file)
--- a/src/org/apache/fop/fo/properties/LineStackingStrategy.java
+++ b/src/org/apache/fop/fo/properties/LineStackingStrategy.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LineStackingStrategy extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/LinefeedTreatment.java b/src/org/apache/fop/fo/properties/LinefeedTreatment.java
index f5e0feb461f76bc0f43a66afa66024becd8b50f7..7cffb122573f52406a62ac3106075553dfef6361 100644 (file)
--- a/src/org/apache/fop/fo/properties/LinefeedTreatment.java
+++ b/src/org/apache/fop/fo/properties/LinefeedTreatment.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class LinefeedTreatment extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Margin.java b/src/org/apache/fop/fo/properties/Margin.java
index 67d6bc6c012628ac3c59d8e364b89af477a7b858..3b74f68e87ba87c7c05ddf0a2a69a5700baffee5 100644 (file)
--- a/src/org/apache/fop/fo/properties/Margin.java
+++ b/src/org/apache/fop/fo/properties/Margin.java
@@ -51,20 +51,19 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
+import java.util.Iterator;
+
+import org.apache.fop.datatypes.Auto;
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Auto;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.indirect.FromNearestSpecified;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Margin extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/MarginBottom.java b/src/org/apache/fop/fo/properties/MarginBottom.java
index 6c5b8d813e54befcc515ca18ed3d7c13a1f28f6f..f3e0a5a46d59d33a57fee7606e9422f3ff0d4f1e 100644 (file)
--- a/src/org/apache/fop/fo/properties/MarginBottom.java
+++ b/src/org/apache/fop/fo/properties/MarginBottom.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MarginBottom extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MarginLeft.java b/src/org/apache/fop/fo/properties/MarginLeft.java
index 27e59f6d111a42cd49a24038c5817c6abb78642f..164d3d81915756934512b034f30915329f80bf28 100644 (file)
--- a/src/org/apache/fop/fo/properties/MarginLeft.java
+++ b/src/org/apache/fop/fo/properties/MarginLeft.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MarginLeft extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MarginRight.java b/src/org/apache/fop/fo/properties/MarginRight.java
index f29cdbf9ffa9e39e24b6d151e23ab143ba757023..eb31edab663ba03782ec7b4640343a2c2c0518c8 100644 (file)
--- a/src/org/apache/fop/fo/properties/MarginRight.java
+++ b/src/org/apache/fop/fo/properties/MarginRight.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MarginRight extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MarginTop.java b/src/org/apache/fop/fo/properties/MarginTop.java
index 0696b1d185222fc1729c21866dc946bdde7c038f..9906c3f33bd5e7b03c9323a8cd1c206873567b59 100644 (file)
--- a/src/org/apache/fop/fo/properties/MarginTop.java
+++ b/src/org/apache/fop/fo/properties/MarginTop.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MarginTop extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MarkerClassName.java b/src/org/apache/fop/fo/properties/MarkerClassName.java
index feac25309bf3d5d96e511b3c1386ac016de9fb35..5c99397acf7613752f7b67032c18279f550e3de2 100644 (file)
--- a/src/org/apache/fop/fo/properties/MarkerClassName.java
+++ b/src/org/apache/fop/fo/properties/MarkerClassName.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MarkerClassName extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/MasterName.java b/src/org/apache/fop/fo/properties/MasterName.java
index 57d8f1862d5193a5ba885401a331bb37a8bd6dae..53008a97705003c7fa31f3a2c4a9f90f5740c861 100644 (file)
--- a/src/org/apache/fop/fo/properties/MasterName.java
+++ b/src/org/apache/fop/fo/properties/MasterName.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MasterName extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/MasterReference.java b/src/org/apache/fop/fo/properties/MasterReference.java
index b8b26d5db3bc62ac216b957847e3ceb95f4e6375..e2e4d9b9eb3ebec0a0eb315ee8cea97517b75ee8 100644 (file)
--- a/src/org/apache/fop/fo/properties/MasterReference.java
+++ b/src/org/apache/fop/fo/properties/MasterReference.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MasterReference extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/MaxHeight.java b/src/org/apache/fop/fo/properties/MaxHeight.java
index 65776aa713c35fe77e8b576904b9c4809f9a67dc..cdc6663660f0801034d990418885951a23507915 100644 (file)
--- a/src/org/apache/fop/fo/properties/MaxHeight.java
+++ b/src/org/apache/fop/fo/properties/MaxHeight.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MaxHeight extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MaxWidth.java b/src/org/apache/fop/fo/properties/MaxWidth.java
index 7827e7856336cf58f24cdb8c516513543fc52473..61652911005310ea753447ba98cf9dbb92e2f0e0 100644 (file)
--- a/src/org/apache/fop/fo/properties/MaxWidth.java
+++ b/src/org/apache/fop/fo/properties/MaxWidth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class MaxWidth extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/MaximumRepeats.java b/src/org/apache/fop/fo/properties/MaximumRepeats.java
index 75dcab727fbb85602f69867a0e865e213511efc8..befd6b872459f707c102d2f47a4cf0d0a6e0dd4c 100644 (file)
--- a/src/org/apache/fop/fo/properties/MaximumRepeats.java
+++ b/src/org/apache/fop/fo/properties/MaximumRepeats.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MaximumRepeats extends Property  {
     public static final int dataTypes = NUMBER | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/MediaUsage.java b/src/org/apache/fop/fo/properties/MediaUsage.java
index 6b0426a1b8476b811c2a35b250f57e3c6af07be4..c4681a146f30b04d78fe2ac37654c9838dfba6da 100644 (file)
--- a/src/org/apache/fop/fo/properties/MediaUsage.java
+++ b/src/org/apache/fop/fo/properties/MediaUsage.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class MediaUsage extends Property  {
     public static final int dataTypes = AUTO | ENUM;

diff --git a/src/org/apache/fop/fo/properties/MinHeight.java b/src/org/apache/fop/fo/properties/MinHeight.java
index aef9af395af41c6dc336bb6261aa9b4dbe7cbd8e..be2f1a58856a7abfd039f62e7178e7cd0610c923 100644 (file)
--- a/src/org/apache/fop/fo/properties/MinHeight.java
+++ b/src/org/apache/fop/fo/properties/MinHeight.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class MinHeight extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/MinWidth.java b/src/org/apache/fop/fo/properties/MinWidth.java
index 900bc839aa119332e06e7042c85121eb5558a7e8..890e5877c7c6603e4a5c2e78b27c1a4caf8c5493 100644 (file)
--- a/src/org/apache/fop/fo/properties/MinWidth.java
+++ b/src/org/apache/fop/fo/properties/MinWidth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class MinWidth extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/NoProperty.java b/src/org/apache/fop/fo/properties/NoProperty.java
index 69567793ee2d181750dc7221446891a41cd51dff..f38cab4bff6584d94807dae71a2a2c53e80c7cb7 100644 (file)
--- a/src/org/apache/fop/fo/properties/NoProperty.java
+++ b/src/org/apache/fop/fo/properties/NoProperty.java
@@ -1,8 +1,5 @@
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
-import org.apache.fop.datastructs.ROStringArray;
 
 public class NoProperty extends Property  {
     // dataTypes was set to ANY_TYPE.  This meant that any property

diff --git a/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java b/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java
index 089338a89b59e8f852c6d654c1bb264df098b1aa..da06a6542fb044112dbaa54d24a836c0f4c73fb8 100644 (file)
--- a/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java
+++ b/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java
@@ -52,10 +52,9 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class NumberColumnsRepeated extends Property  {
     public static final int dataTypes = NUMBER;

diff --git a/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java b/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java
index c38d53031b11b6c9697d5a0ef0ebcda32541c033..2582007fa102238e0d83ab07753d5c96654731d7 100644 (file)
--- a/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java
+++ b/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java
@@ -52,10 +52,9 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class NumberColumnsSpanned extends Property  {
     public static final int dataTypes = NUMBER;

diff --git a/src/org/apache/fop/fo/properties/NumberRowsSpanned.java b/src/org/apache/fop/fo/properties/NumberRowsSpanned.java
index 4e91a19a58e7176b6628dbde7dab0c61fde71f4e..ae40816c595252dad7ea2e7c74213855119e07c2 100644 (file)
--- a/src/org/apache/fop/fo/properties/NumberRowsSpanned.java
+++ b/src/org/apache/fop/fo/properties/NumberRowsSpanned.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class NumberRowsSpanned extends Property  {
     public static final int dataTypes = NUMBER;

diff --git a/src/org/apache/fop/fo/properties/OddOrEven.java b/src/org/apache/fop/fo/properties/OddOrEven.java
index d341b392427a7be7fc03a4003cfabea7a84360f8..ea76df9f02b95dd433c7107300d181ab53c95907 100644 (file)
--- a/src/org/apache/fop/fo/properties/OddOrEven.java
+++ b/src/org/apache/fop/fo/properties/OddOrEven.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class OddOrEven extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Orphans.java b/src/org/apache/fop/fo/properties/Orphans.java
index d43d1bf3c229b314c60cc71e73dc88647245303c..8997702c33031f6ba8686856d2274c1d4fb3a4ee 100644 (file)
--- a/src/org/apache/fop/fo/properties/Orphans.java
+++ b/src/org/apache/fop/fo/properties/Orphans.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Orphans extends Property  {
     public static final int dataTypes = INTEGER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Overflow.java b/src/org/apache/fop/fo/properties/Overflow.java
index 651e09c670428a3b02d132d51f50508af6b3a443..27b72eeb487d6cdb4703e3630bf5bc38e75081c2 100644 (file)
--- a/src/org/apache/fop/fo/properties/Overflow.java
+++ b/src/org/apache/fop/fo/properties/Overflow.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class Overflow extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Padding.java b/src/org/apache/fop/fo/properties/Padding.java
index acdc175b54f2748d7272c5d0154605ef9f4d7a48..61598b3c5f3b3b1586a65a7c91c7c399ef435eb6 100644 (file)
--- a/src/org/apache/fop/fo/properties/Padding.java
+++ b/src/org/apache/fop/fo/properties/Padding.java
@@ -51,19 +51,18 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Padding extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/PaddingAfter.java b/src/org/apache/fop/fo/properties/PaddingAfter.java
index 83e89cf6c5ddcf43f545cfd929f11c6391db1e86..8f2b9d4de24d3bc1315e6cbd0798ef34f13868d1 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingAfter.java
+++ b/src/org/apache/fop/fo/properties/PaddingAfter.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingAfter extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java b/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java
index 00881d0df115c4c9645002e5f9f12b816e3c3638..d577522cd7b02d7058c8eeff9cdf437168dc41ad 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java
+++ b/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingAfterConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/PaddingAfterLength.java b/src/org/apache/fop/fo/properties/PaddingAfterLength.java
index 859d13619a27b4266d72ab1358005481426dbe69..ac24eae9a9b37b402d6641550ed031257396d929 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingAfterLength.java
+++ b/src/org/apache/fop/fo/properties/PaddingAfterLength.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingAfterLength extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH;

diff --git a/src/org/apache/fop/fo/properties/PaddingBefore.java b/src/org/apache/fop/fo/properties/PaddingBefore.java
index 7ec0b28985d197f7523b455834e5f01e70de41f0..111105b06d1c7ac64952fd8d6d60b566095c6a04 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingBefore.java
+++ b/src/org/apache/fop/fo/properties/PaddingBefore.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingBefore extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java b/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java
index 0461842cc049968540647fa139d91cd3432d1dd1..264f9961fc0974324f44b0344085a4f0add58555 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java
+++ b/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingBeforeConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/PaddingBeforeLength.java b/src/org/apache/fop/fo/properties/PaddingBeforeLength.java
index e20b7eda8c8627e163f86fc1ef912d12e845e6db..da2e17f90ce3add714bc092b33fe6da653c82801 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingBeforeLength.java
+++ b/src/org/apache/fop/fo/properties/PaddingBeforeLength.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingBeforeLength extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/PaddingBottom.java b/src/org/apache/fop/fo/properties/PaddingBottom.java
index de58072beb9a17a8836130ca00d8a43395369327..8247338b8a4b9bfdff1176fefe3c3feffa764b77 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingBottom.java
+++ b/src/org/apache/fop/fo/properties/PaddingBottom.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingBottom extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PaddingEnd.java b/src/org/apache/fop/fo/properties/PaddingEnd.java
index 467767a3f6072033f91bfbca6f2fbf1a12505f9a..750d89a60591b6524b60e188fe5491ebf6be8158 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingEnd.java
+++ b/src/org/apache/fop/fo/properties/PaddingEnd.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingEnd extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/PaddingEndConditionality.java b/src/org/apache/fop/fo/properties/PaddingEndConditionality.java
index cc835c92140fcaa738ed0aba6aff5347f397ce21..e4efb9fc3ec6da23beae3ab4c18055b807bdf562 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingEndConditionality.java
+++ b/src/org/apache/fop/fo/properties/PaddingEndConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingEndConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/PaddingEndLength.java b/src/org/apache/fop/fo/properties/PaddingEndLength.java
index 6106084f784ef583839b0453db2b8cd8b4d2ee95..6b4c9fb0b9b7b3482fc129781b224ca7e985010c 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingEndLength.java
+++ b/src/org/apache/fop/fo/properties/PaddingEndLength.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingEndLength extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH;

diff --git a/src/org/apache/fop/fo/properties/PaddingLeft.java b/src/org/apache/fop/fo/properties/PaddingLeft.java
index 41c11b9d9133ae2b45092189471e2589efec191d..769382c50f036779089567317f7d6e8f501ab3ba 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingLeft.java
+++ b/src/org/apache/fop/fo/properties/PaddingLeft.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingLeft extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PaddingRight.java b/src/org/apache/fop/fo/properties/PaddingRight.java
index 7ce67a8bfd37d47f11e0b8a3669188c1ab0e64d8..8ac3ca3a4a00785daa8f05fca17c1f23d15e723f 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingRight.java
+++ b/src/org/apache/fop/fo/properties/PaddingRight.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingRight extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PaddingStart.java b/src/org/apache/fop/fo/properties/PaddingStart.java
index ebc0d7b4b7d755bae8395ee006d2df44ee67ccf8..150ca47bccf9beaa0657e6e48351d660bd08a2a8 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingStart.java
+++ b/src/org/apache/fop/fo/properties/PaddingStart.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingStart extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/PaddingStartConditionality.java b/src/org/apache/fop/fo/properties/PaddingStartConditionality.java
index e6041671aec0379b3400c9e468711afa325eb50b..3ad6672ed0a958e20952c44a2b51f68c9f7e8c27 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingStartConditionality.java
+++ b/src/org/apache/fop/fo/properties/PaddingStartConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingStartConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/PaddingStartLength.java b/src/org/apache/fop/fo/properties/PaddingStartLength.java
index 55ac8678d71c446a1111b7a7842f4aedb3eef151..ecf60ad382eed3e19de7f2a0e29a81fa799df659 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingStartLength.java
+++ b/src/org/apache/fop/fo/properties/PaddingStartLength.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingStartLength extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH;

diff --git a/src/org/apache/fop/fo/properties/PaddingTop.java b/src/org/apache/fop/fo/properties/PaddingTop.java
index 60d5da7df0ff908c472befd589d33d7da2d574fa..83dc1cee6eda6eb5378b6994abd1f467628626ff 100644 (file)
--- a/src/org/apache/fop/fo/properties/PaddingTop.java
+++ b/src/org/apache/fop/fo/properties/PaddingTop.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PaddingTop extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PageBreakAfter.java b/src/org/apache/fop/fo/properties/PageBreakAfter.java
index 6351c8be1401b6e494b0d51b3ce8748c32ac38f6..438fc6616453afddf6fcb001e28f507d38b09b8a 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageBreakAfter.java
+++ b/src/org/apache/fop/fo/properties/PageBreakAfter.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PageBreakCommon;
 
 public class PageBreakAfter extends PageBreakCommon {
 }

diff --git a/src/org/apache/fop/fo/properties/PageBreakBefore.java b/src/org/apache/fop/fo/properties/PageBreakBefore.java
index 1dbe70dc68b51fcce458a486a18b0c662b59ef25..0550ff94b3f611ee4d3bf194978a6caf7a42aac3 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageBreakBefore.java
+++ b/src/org/apache/fop/fo/properties/PageBreakBefore.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.PageBreakCommon;
 
 public class PageBreakBefore extends PageBreakCommon {
 }

diff --git a/src/org/apache/fop/fo/properties/PageBreakCommon.java b/src/org/apache/fop/fo/properties/PageBreakCommon.java
index 195928fe2cecdb3ba93597bf1a22b2452a260c64..c9b874aa71958b168e0fb439050ef0d6e89468fd 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageBreakCommon.java
+++ b/src/org/apache/fop/fo/properties/PageBreakCommon.java
@@ -51,22 +51,21 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.NCName;
-import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.Auto;
+import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.indirect.FromNearestSpecified;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.HashMap;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PageBreakCommon extends Property  {
     public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PageBreakInside.java b/src/org/apache/fop/fo/properties/PageBreakInside.java
index ca3de3c54f04a5622b2a7dbb97445c09f6037e34..0dbee0590d6ef1af376c6e69be017e5cb4cb56a3 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageBreakInside.java
+++ b/src/org/apache/fop/fo/properties/PageBreakInside.java
@@ -51,20 +51,17 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Auto;
 import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Auto;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.indirect.FromParent;
 import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PageBreakInside extends Property  {
     public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PageHeight.java b/src/org/apache/fop/fo/properties/PageHeight.java
index 051cfd1c72b35ece33469974ea74a7c6f658bc29..2ec6c3505a471ed9f36081919903a7d6da3f39f4 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageHeight.java
+++ b/src/org/apache/fop/fo/properties/PageHeight.java
@@ -51,9 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.PageHeightWidth;
 
 public class PageHeight extends PageHeightWidth  {
     public static final int dataTypes = LENGTH | AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PageHeightWidth.java b/src/org/apache/fop/fo/properties/PageHeightWidth.java
index 027cb18ab169a21bd6091d095ee1dba4634c011f..81d4214be8210750171d411a0cc816f745d558a2 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageHeightWidth.java
+++ b/src/org/apache/fop/fo/properties/PageHeightWidth.java
@@ -52,7 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class PageHeightWidth extends Property  {
 

diff --git a/src/org/apache/fop/fo/properties/PagePosition.java b/src/org/apache/fop/fo/properties/PagePosition.java
index 0bb3cca6aeff9119057ddf3335f69700e014bc1c..ed22e887a5ec60cfa41a7924548002b5499c3f70 100644 (file)
--- a/src/org/apache/fop/fo/properties/PagePosition.java
+++ b/src/org/apache/fop/fo/properties/PagePosition.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class PagePosition extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PageWidth.java b/src/org/apache/fop/fo/properties/PageWidth.java
index d4e91344a001321b47b821d271b2354769cf80f0..8d9727ce2ef62909d1508af7d274af3b44183172 100644 (file)
--- a/src/org/apache/fop/fo/properties/PageWidth.java
+++ b/src/org/apache/fop/fo/properties/PageWidth.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.PageHeightWidth;
 
 public class PageWidth extends PageHeightWidth  {
     public static final int dataTypes = LENGTH | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Pause.java b/src/org/apache/fop/fo/properties/Pause.java
index 26787b198edc1a9bbc095abe9731ebba4784efc6..23e384695108b6aa7ecfd1a12ef79e50559f79e5 100644 (file)
--- a/src/org/apache/fop/fo/properties/Pause.java
+++ b/src/org/apache/fop/fo/properties/Pause.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Pause extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/PauseAfter.java b/src/org/apache/fop/fo/properties/PauseAfter.java
index 83ca2051d7d2e40e8163beb78d59adcab3dab10b..8190fd796c13d592ea9c6254a18ab3a6999b6ca8 100644 (file)
--- a/src/org/apache/fop/fo/properties/PauseAfter.java
+++ b/src/org/apache/fop/fo/properties/PauseAfter.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class PauseAfter extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/PauseBefore.java b/src/org/apache/fop/fo/properties/PauseBefore.java
index 047ef014c492e9ebe3a264bc20f14b7845918d05..52ba9eed03ef8a454a283e41416ab5dc09f18fc4 100644 (file)
--- a/src/org/apache/fop/fo/properties/PauseBefore.java
+++ b/src/org/apache/fop/fo/properties/PauseBefore.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class PauseBefore extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Pitch.java b/src/org/apache/fop/fo/properties/Pitch.java
index 2fc5b23f05b4c0ca791667bdc2a48752a1019c50..bb99c182dbf6ad1e497f2204bdfa8b6c72b23e89 100644 (file)
--- a/src/org/apache/fop/fo/properties/Pitch.java
+++ b/src/org/apache/fop/fo/properties/Pitch.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Pitch extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/PitchRange.java b/src/org/apache/fop/fo/properties/PitchRange.java
index f7fed700445b769216cb0e2690d235ef7f1c0968..dc032e473152816d570acb1f04de6dd78028ae7a 100644 (file)
--- a/src/org/apache/fop/fo/properties/PitchRange.java
+++ b/src/org/apache/fop/fo/properties/PitchRange.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class PitchRange extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/PlayDuring.java b/src/org/apache/fop/fo/properties/PlayDuring.java
index 6cd7bc876010930769ad871b2a1b908031c3ddfa..6a999fdfe681a588838aa23f1e0a3b9252465b8d 100644 (file)
--- a/src/org/apache/fop/fo/properties/PlayDuring.java
+++ b/src/org/apache/fop/fo/properties/PlayDuring.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class PlayDuring extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Position.java b/src/org/apache/fop/fo/properties/Position.java
index 0c09a7977a3d19ae462c9bcf35929a91773c95a9..c4d327e77d81763f822e7d66d82b753be830d7a4 100644 (file)
--- a/src/org/apache/fop/fo/properties/Position.java
+++ b/src/org/apache/fop/fo/properties/Position.java
@@ -51,20 +51,18 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Auto;
 import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Auto;
-import org.apache.fop.datatypes.indirect.Inherit;
-import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Position extends Property  {
     public static final int dataTypes = SHORTHAND | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Precedence.java b/src/org/apache/fop/fo/properties/Precedence.java
index 1d3e16015e983262c4a477d9550c5e6e618465be..29460e20a3864963cdbf902d7aa37d78ae3fbc02 100644 (file)
--- a/src/org/apache/fop/fo/properties/Precedence.java
+++ b/src/org/apache/fop/fo/properties/Precedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Precedence extends Property  {
     public static final int dataTypes = BOOL | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/PrecedenceCommon.java b/src/org/apache/fop/fo/properties/PrecedenceCommon.java
index e12f02bbe8d151ae1ea3decf035adeec666384e2..59e7b6feff757ce6c8a1e5d3725c4bce0ea67566 100644 (file)
--- a/src/org/apache/fop/fo/properties/PrecedenceCommon.java
+++ b/src/org/apache/fop/fo/properties/PrecedenceCommon.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class PrecedenceCommon extends Property  {
     public static final int FORCE = 1;

diff --git a/src/org/apache/fop/fo/properties/Property.java b/src/org/apache/fop/fo/properties/Property.java
index da4f2723fa196ead789f967d6c71f877550b11ad..158d08e8da97c7dbd8a7a64c30b1d512e7386150 100644 (file)
--- a/src/org/apache/fop/fo/properties/Property.java
+++ b/src/org/apache/fop/fo/properties/Property.java
@@ -55,63 +55,33 @@
 
 package org.apache.fop.fo.properties;
 
-import java.lang.Class;
-import java.lang.reflect.Method;
-
 import java.util.Iterator;
-import java.util.ListIterator;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.LinkedList;
-import java.util.Collections;
-
-import org.apache.fop.messaging.MessageHandler;
 
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.ShorthandPropSets;
-import org.apache.fop.fo.FOTree;
-import org.apache.fop.fo.FOPropertySets;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.AbstractPropertyValue;
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.expr.PropertyNotImplementedException;
-import org.apache.fop.fo.expr.SystemFontFunction;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datastructs.ROIntArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.datatypes.NoType;
-import org.apache.fop.datatypes.StringType;
-import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.Auto;
+import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.CountryType;
-import org.apache.fop.datatypes.LanguageType;
-import org.apache.fop.datatypes.ScriptType;
-import org.apache.fop.datatypes.UriType;
-import org.apache.fop.datatypes.MimeType;
-import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.Ems;
-import org.apache.fop.datatypes.Percentage;
-import org.apache.fop.datatypes.Angle;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.LanguageType;
 import org.apache.fop.datatypes.MappedNumeric;
-import org.apache.fop.datatypes.IntegerType;
-import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Bool;
-import org.apache.fop.datatypes.Literal;
-import org.apache.fop.datatypes.Auto;
+import org.apache.fop.datatypes.NCName;
+import org.apache.fop.datatypes.NoType;
 import org.apache.fop.datatypes.None;
-import org.apache.fop.datatypes.ColorType;
-import org.apache.fop.datatypes.FontFamilySet;
-import org.apache.fop.datatypes.TextDecorations;
-import org.apache.fop.datatypes.TextDecorator;
-import org.apache.fop.datatypes.ShadowEffect;
-import org.apache.fop.datatypes.Slash;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.datatypes.ScriptType;
+import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.datatypes.indirect.FromParent;
 import org.apache.fop.datatypes.indirect.Inherit;
 import org.apache.fop.datatypes.indirect.InheritedValue;
-import org.apache.fop.datatypes.indirect.FromParent;
-import org.apache.fop.datatypes.indirect.FromNearestSpecified;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
+import org.apache.fop.fo.ShorthandPropSets;
+import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.expr.PropertyNotImplementedException;
+import org.apache.fop.messaging.MessageHandler;
 
 /**
  * Parent class for all of the individual property classes.  It also contains

diff --git a/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java b/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java
index 10262b00e86a5eb0dfe435b61b7f6497868be322..5e5b28333c4eba36ee73f34bb02e2ccba8148606 100644 (file)
--- a/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java
+++ b/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ProvisionalDistanceBetweenStarts extends Property  {
     public static final int dataTypes = LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java b/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java
index 600e07401043ca96ee7f0db76738e77cdfcc1503..54ec8adf2d167d27590a66f4289b0d152f8cdd52 100644 (file)
--- a/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java
+++ b/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ProvisionalLabelSeparation extends Property  {
     public static final int dataTypes = LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RefId.java b/src/org/apache/fop/fo/properties/RefId.java
index fbf75e35f667ad5794669c2cd129b7d949865635..d2265e164ee1545201a7d74ed2e2b68b18b9ad1e 100644 (file)
--- a/src/org/apache/fop/fo/properties/RefId.java
+++ b/src/org/apache/fop/fo/properties/RefId.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class RefId extends Property  {
     public static final int dataTypes = NCNAME | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ReferenceOrientation.java b/src/org/apache/fop/fo/properties/ReferenceOrientation.java
index e4ef9d5612df2789d6842a6143d25ac093832209..96b188052f955e6f75ebefa3d8cf217fcadb6b4d 100644 (file)
--- a/src/org/apache/fop/fo/properties/ReferenceOrientation.java
+++ b/src/org/apache/fop/fo/properties/ReferenceOrientation.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ReferenceOrientation extends Property  {
     public static final int dataTypes = INTEGER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RegionName.java b/src/org/apache/fop/fo/properties/RegionName.java
index ca6d999c704bfc5b0a63d11da83733a1c11f3684..0f0ad6182503f9405181c17aa6fce2e8e016351d 100644 (file)
--- a/src/org/apache/fop/fo/properties/RegionName.java
+++ b/src/org/apache/fop/fo/properties/RegionName.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RegionName extends Property  {
     public static final int dataTypes = NCNAME | ENUM;

diff --git a/src/org/apache/fop/fo/properties/RelativeAlign.java b/src/org/apache/fop/fo/properties/RelativeAlign.java
index 24ca71a0c0d5620444f7476ef70af63398a54d96..02a2450848226d58f749c01eb5f9edde850a2e0a 100644 (file)
--- a/src/org/apache/fop/fo/properties/RelativeAlign.java
+++ b/src/org/apache/fop/fo/properties/RelativeAlign.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RelativeAlign extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RelativePosition.java b/src/org/apache/fop/fo/properties/RelativePosition.java
index 41a98d9f4234de9f2652ce04d77e35bdc9fce143..e0ef131d681a3a18953f4a8b28c89460c6c93e72 100644 (file)
--- a/src/org/apache/fop/fo/properties/RelativePosition.java
+++ b/src/org/apache/fop/fo/properties/RelativePosition.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RelativePosition extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RenderingIntent.java b/src/org/apache/fop/fo/properties/RenderingIntent.java
index 28dc981684b8e97a073eb3322543aeb41a99bdb5..1b38b55ea6d2f6fec3f86ac094d5e276d2268bed 100644 (file)
--- a/src/org/apache/fop/fo/properties/RenderingIntent.java
+++ b/src/org/apache/fop/fo/properties/RenderingIntent.java
@@ -51,14 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datatypes.Ints;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Collections;
+
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RenderingIntent extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RetrieveBoundary.java b/src/org/apache/fop/fo/properties/RetrieveBoundary.java
index 7f501cc56dea33afcd5b6efe9b276eaf34760c98..022f61f611ddec7405ba21e4d8cda2e0e3029b91 100644 (file)
--- a/src/org/apache/fop/fo/properties/RetrieveBoundary.java
+++ b/src/org/apache/fop/fo/properties/RetrieveBoundary.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RetrieveBoundary extends Property  {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/RetrieveClassName.java b/src/org/apache/fop/fo/properties/RetrieveClassName.java
index 23259fa7cdc53383d537c11614b4268e58af781b..0eb0a2d6dc8a298465f9b597bdc5ba38192bf3ab 100644 (file)
--- a/src/org/apache/fop/fo/properties/RetrieveClassName.java
+++ b/src/org/apache/fop/fo/properties/RetrieveClassName.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class RetrieveClassName extends Property  {
     public static final int dataTypes = NCNAME;

diff --git a/src/org/apache/fop/fo/properties/RetrievePosition.java b/src/org/apache/fop/fo/properties/RetrievePosition.java
index ed5b83cab4336aa8ed1aac7b1c341a3369796742..cb1d95113044d4ea5a969b2da6b981ba23bf2178 100644 (file)
--- a/src/org/apache/fop/fo/properties/RetrievePosition.java
+++ b/src/org/apache/fop/fo/properties/RetrievePosition.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RetrievePosition extends Property  {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/Richness.java b/src/org/apache/fop/fo/properties/Richness.java
index 1b8a66a4c22efde21773f327e349ff53da49f0c7..0de3cba2ff4ce5206234a06755adc1951b1b4e82 100644 (file)
--- a/src/org/apache/fop/fo/properties/Richness.java
+++ b/src/org/apache/fop/fo/properties/Richness.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Richness extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Right.java b/src/org/apache/fop/fo/properties/Right.java
index 055792ae9a2f664905ff0b78c38a78fd73ed7f21..d1790e7d99c9f8ecb2b716f9fd0aeef8cc5c705d 100644 (file)
--- a/src/org/apache/fop/fo/properties/Right.java
+++ b/src/org/apache/fop/fo/properties/Right.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Right extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/Role.java b/src/org/apache/fop/fo/properties/Role.java
index 7a2f8d8043193d6361111d15981793a7b0c72f4a..dbba8016de3b4e4c2eb11dc8a6a2c098d87fcd9b 100644 (file)
--- a/src/org/apache/fop/fo/properties/Role.java
+++ b/src/org/apache/fop/fo/properties/Role.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Role extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/RuleStyle.java b/src/org/apache/fop/fo/properties/RuleStyle.java
index 0721aedca91c3ddd9007c3bac2d7f0f86b77ec87..21d830190089265c600f812a76f23776d734a322 100644 (file)
--- a/src/org/apache/fop/fo/properties/RuleStyle.java
+++ b/src/org/apache/fop/fo/properties/RuleStyle.java
@@ -51,17 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RuleStyle extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/RuleThickness.java b/src/org/apache/fop/fo/properties/RuleThickness.java
index 78f16e19c5fc1de0e97ac5d7afa8058d694d5057..8277f74a948ace6be8e6441d561aa14e6772c1de 100644 (file)
--- a/src/org/apache/fop/fo/properties/RuleThickness.java
+++ b/src/org/apache/fop/fo/properties/RuleThickness.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class RuleThickness extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/Scaling.java b/src/org/apache/fop/fo/properties/Scaling.java
index 1ed29aa41cd7d2b72eb833f6af8370a13e23e2e0..15bd338089f09b07d45093e0a7618194943e2e01 100644 (file)
--- a/src/org/apache/fop/fo/properties/Scaling.java
+++ b/src/org/apache/fop/fo/properties/Scaling.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Scaling extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ScalingMethod.java b/src/org/apache/fop/fo/properties/ScalingMethod.java
index e00511637f7d4aa00a06bf565e8625a1ad9c6534..6feabd09d2fda10153ea729c8136f4c4a4f86f06 100644 (file)
--- a/src/org/apache/fop/fo/properties/ScalingMethod.java
+++ b/src/org/apache/fop/fo/properties/ScalingMethod.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class ScalingMethod extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ScoreSpaces.java b/src/org/apache/fop/fo/properties/ScoreSpaces.java
index 6f8205bf5b24f1f366e9a9427778868fd6769a69..d726f587d64dde3eb2dabf060f68a25e24d14917 100644 (file)
--- a/src/org/apache/fop/fo/properties/ScoreSpaces.java
+++ b/src/org/apache/fop/fo/properties/ScoreSpaces.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ScoreSpaces extends Property  {
     public static final int dataTypes = BOOL | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Script.java b/src/org/apache/fop/fo/properties/Script.java
index a159cc681507f37ed415a86651df3405f74ab054..99cf0f127f41ba3313a2d94ba476e0e032e77c3c 100644 (file)
--- a/src/org/apache/fop/fo/properties/Script.java
+++ b/src/org/apache/fop/fo/properties/Script.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Script extends Property  {
     public static final int dataTypes = SCRIPT_T | AUTO | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/ShowDestination.java b/src/org/apache/fop/fo/properties/ShowDestination.java
index 6d053a7936c99b674938fb02a86cdf759a531c9d..21714b4f5b680f6dd312bbf4200a4d6800563583 100644 (file)
--- a/src/org/apache/fop/fo/properties/ShowDestination.java
+++ b/src/org/apache/fop/fo/properties/ShowDestination.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class ShowDestination extends Property  {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/Size.java b/src/org/apache/fop/fo/properties/Size.java
index d7b7087fb6d095e9a40fc8e5b3c606d19ee2e457..ed9377b6e238afe7639140848fac800a9455e6a4 100644 (file)
--- a/src/org/apache/fop/fo/properties/Size.java
+++ b/src/org/apache/fop/fo/properties/Size.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class Size extends Property  {
     public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/SourceDocument.java b/src/org/apache/fop/fo/properties/SourceDocument.java
index b12266f584c6dc53c7d155b45d6d021ff519fc7e..6a35b190e326b8b6ddfa85cd6af99d938c0dc9d7 100644 (file)
--- a/src/org/apache/fop/fo/properties/SourceDocument.java
+++ b/src/org/apache/fop/fo/properties/SourceDocument.java
@@ -51,15 +51,14 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropNames;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.UriType;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SourceDocument extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/SpaceAfter.java b/src/org/apache/fop/fo/properties/SpaceAfter.java
index 04ab1145c966555c9769d8a4b068e4c37fadb45f..49c3e47a12b83c65eb2b9c1bf95a6a41e4224601 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfter.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfter.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfter extends Property  {
     public static final int dataTypes = COMPOUND | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java b/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java
index ac3f02963eca2438b5924f12792c6cc4476636e3..b7456652300775ab120bbe3475a33903612f9ce9 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfterConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java b/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java
index 04c8412893f6a8eeddc14783b9676b6c0b68b8da..6cec962da91cb4c2af58b1c9dd9a6cd99434df9d 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfterMaximum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java b/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java
index 06eecf6d2f468cdeb4af09ff3ff25a6fd7628a42..a295a2504bd37d015ce8f215d5b56eaa48621e06 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfterMinimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java b/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java
index a8ea35029af2d34f9f5a223adae26bd506fb73cc..7ab1f738135d1acc19a3df3bf39204c86d8800c5 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfterOptimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java b/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java
index 7ff8a253100ecfdc810635de43e2215b2aedebcc..fbcb1d985e7b29cfcd4d91fd12677d4699501808 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java
+++ b/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceAfterPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceBefore.java b/src/org/apache/fop/fo/properties/SpaceBefore.java
index 1cfe68b65d1f50d9ace4b202f6a6e8cd068c2900..642a24fd7479658106c717377b144fd9a984def9 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBefore.java
+++ b/src/org/apache/fop/fo/properties/SpaceBefore.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBefore extends Property  {
     public static final int dataTypes = COMPOUND | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java b/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java
index 438d799ce0ddaab6e41337784806012c2fd5b78a..3b80c600866d798f4d83a51678bd2986e3ddcf4c 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java
+++ b/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBeforeConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java b/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java
index 34edfb49f41656efd8c51d727b8dc9ab617dabf4..dc769efe9bff81708b6cadf8c6fb5bd634fe1ccc 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java
+++ b/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBeforeMaximum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java b/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java
index 91a493b61f03286d0c7f408569fa2837adad5d1b..cadb6dca935d769c0eca41745fa42633ee6c87a6 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBeforeMinimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java b/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java
index adbd6d99514686a2be1c87cda390793cb2c51e61..afdf3f73c97d76af14fb25d6deaa12895835fbf6 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBeforeOptimum extends Property  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java b/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java
index b48018dca7c18b740d55edb6dad4e2c41c38e3c6..824446a03188d8c7c89a8ca0bebf8a0f9ee90dd5 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java
+++ b/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceBeforePrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceEnd.java b/src/org/apache/fop/fo/properties/SpaceEnd.java
index 113bb1d9465912fc27eda53f4cda931feca8bdfd..4e1809b6c10543c41e831bbdccc0d02ef0579cb4 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEnd.java
+++ b/src/org/apache/fop/fo/properties/SpaceEnd.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEnd extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/SpaceEndConditionality.java b/src/org/apache/fop/fo/properties/SpaceEndConditionality.java
index 734ecffe42fb71268ddedeaa8b8127178b04061d..1afc4246f1601f8c620990d0a8077189d70695f4 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEndConditionality.java
+++ b/src/org/apache/fop/fo/properties/SpaceEndConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEndConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceEndMaximum.java b/src/org/apache/fop/fo/properties/SpaceEndMaximum.java
index ee267b557c6101c58033ef4a23fc4267ea6abdc8..8407d613f0ca4186172d07b24f20e3ee86638fab 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEndMaximum.java
+++ b/src/org/apache/fop/fo/properties/SpaceEndMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEndMaximum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceEndMinimum.java b/src/org/apache/fop/fo/properties/SpaceEndMinimum.java
index 0eb65a29e20b384912dbf3cc5650ee814838f162..cd3b3ebfd4470464f6eb3bb345a4b782ca264b60 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEndMinimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceEndMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEndMinimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceEndOptimum.java b/src/org/apache/fop/fo/properties/SpaceEndOptimum.java
index 46b8d9b38d6ca127c5ce440307c1c02d48eb61cf..25612115d647c1b23a5ac9497f3de77c0d11eae2 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEndOptimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceEndOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEndOptimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java b/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java
index 7dd6f4b85c39a6ec6482fd6b11a471a41b515a0b..a604998a2123fa12f22f300bd72a41cfeceb0a2f 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java
+++ b/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceEndPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceStart.java b/src/org/apache/fop/fo/properties/SpaceStart.java
index e4747947f00c7f200b86430bd5594a7732a962ba..fdf85cbad57cfc4ab65d1c89f3943c35f96a8742 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStart.java
+++ b/src/org/apache/fop/fo/properties/SpaceStart.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStart extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/SpaceStartConditionality.java b/src/org/apache/fop/fo/properties/SpaceStartConditionality.java
index 934e98ce093e8a455d7b7c34505d3841739555d8..6710bdb7736f61305f64eb8c5af54e3518546bb3 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStartConditionality.java
+++ b/src/org/apache/fop/fo/properties/SpaceStartConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStartConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/SpaceStartMaximum.java b/src/org/apache/fop/fo/properties/SpaceStartMaximum.java
index d8ba2dd101d503b8043d54bd25effd7d444132be..0babc87600fb11e939bbf4035bbbced02baa133e 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStartMaximum.java
+++ b/src/org/apache/fop/fo/properties/SpaceStartMaximum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStartMaximum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceStartMinimum.java b/src/org/apache/fop/fo/properties/SpaceStartMinimum.java
index f0c0840465ae5a6f4eb0974ccd8440ce527093d9..5712338c401e0667d1b9c23d1d9d86b886a116b8 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStartMinimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceStartMinimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStartMinimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceStartOptimum.java b/src/org/apache/fop/fo/properties/SpaceStartOptimum.java
index 2e21d5eabf460b51f6689e14886fb426e04a3683..b2526bfe00759a6ca576cc1a667f54468c369a47 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStartOptimum.java
+++ b/src/org/apache/fop/fo/properties/SpaceStartOptimum.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStartOptimum extends Property  {
     public static final int dataTypes = LENGTH | PERCENTAGE;

diff --git a/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java b/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java
index c1d2d9d6031872c60eef7b98a25b0af4ba9eabbd..0b40c62a92d4bbafe13c70c2fb0f93b9d3d42804 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java
+++ b/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SpaceStartPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/Span.java b/src/org/apache/fop/fo/properties/Span.java
index f919021477e54686bf0a7f3d0edbbca763008e4b..b140db42e954515ac997e03a2e5ab459f74d105b 100644 (file)
--- a/src/org/apache/fop/fo/properties/Span.java
+++ b/src/org/apache/fop/fo/properties/Span.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class Span extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Speak.java b/src/org/apache/fop/fo/properties/Speak.java
index ee98014ba9f859aa7c26f3b55e5baaad3db8daac..659c064dbe2fabc7897af63ec9fbb7316ecf0ee3 100644 (file)
--- a/src/org/apache/fop/fo/properties/Speak.java
+++ b/src/org/apache/fop/fo/properties/Speak.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Speak extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/SpeakHeader.java b/src/org/apache/fop/fo/properties/SpeakHeader.java
index 833cd82b9ac9752de57f34352254aee7fc705fc3..45d5e59e651f351f06c571139b62a83179070000 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpeakHeader.java
+++ b/src/org/apache/fop/fo/properties/SpeakHeader.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class SpeakHeader extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/SpeakNumeral.java b/src/org/apache/fop/fo/properties/SpeakNumeral.java
index 29a4bcf65161e3192f7e2a6bf673b44fad0832ad..c2163625eb464b264abe77008a805069ecd22f0e 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpeakNumeral.java
+++ b/src/org/apache/fop/fo/properties/SpeakNumeral.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class SpeakNumeral extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/SpeakPunctuation.java b/src/org/apache/fop/fo/properties/SpeakPunctuation.java
index 301e67218a0409f110e6f7744b4c6afcc59f873e..70b74fffc42b032a53b4bdb13ceeb351c92bd9d6 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpeakPunctuation.java
+++ b/src/org/apache/fop/fo/properties/SpeakPunctuation.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class SpeakPunctuation extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/SpeechRate.java b/src/org/apache/fop/fo/properties/SpeechRate.java
index 767e2691152dffa3aa7c7a6d830f3a2b937202eb..ed27066c186e8465685d6e1e0b24f8e608029d69 100644 (file)
--- a/src/org/apache/fop/fo/properties/SpeechRate.java
+++ b/src/org/apache/fop/fo/properties/SpeechRate.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class SpeechRate extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Src.java b/src/org/apache/fop/fo/properties/Src.java
index 7d1151db1f3bdfb8d764c9d7e63fa8d78968ab3a..5220512b601f224931d08155a1db7030ce141a6a 100644 (file)
--- a/src/org/apache/fop/fo/properties/Src.java
+++ b/src/org/apache/fop/fo/properties/Src.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Src extends Property  {
     public static final int dataTypes = URI_SPECIFICATION | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/StartIndent.java b/src/org/apache/fop/fo/properties/StartIndent.java
index 5180337aecd1600979841e2163357b268e562689..70b41dcb96b60aafac009a2fc6582ddec80a2239 100644 (file)
--- a/src/org/apache/fop/fo/properties/StartIndent.java
+++ b/src/org/apache/fop/fo/properties/StartIndent.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class StartIndent extends Property  {
     public static final int dataTypes = LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/StartingState.java b/src/org/apache/fop/fo/properties/StartingState.java
index cfad14d33da5bff4e9399d49f16cff2f371c4de1..2b0b74863ce9856179fa8b108688776cfad5028a 100644 (file)
--- a/src/org/apache/fop/fo/properties/StartingState.java
+++ b/src/org/apache/fop/fo/properties/StartingState.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class StartingState extends Property  {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/StartsRow.java b/src/org/apache/fop/fo/properties/StartsRow.java
index f7df98bfd66125e8a8371b2b9ad9392c0e2f7552..469b6e9cec75fbc1821df75670f0a0ca8d1cb91f 100644 (file)
--- a/src/org/apache/fop/fo/properties/StartsRow.java
+++ b/src/org/apache/fop/fo/properties/StartsRow.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class StartsRow extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/Stress.java b/src/org/apache/fop/fo/properties/Stress.java
index d2e22f9ab399eaab1eedcc85ec692b832db19a37..140cb755d6b9beab26c96d685ed3697e592f6dc8 100644 (file)
--- a/src/org/apache/fop/fo/properties/Stress.java
+++ b/src/org/apache/fop/fo/properties/Stress.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Stress extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java b/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java
index 89cdcf703a245f7927e9aae4c4e9b291a13fb40a..fcca38da532dcae50b6a3d3d149b445f7c139e65 100644 (file)
--- a/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java
+++ b/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class SuppressAtLineBreak extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/SwitchTo.java b/src/org/apache/fop/fo/properties/SwitchTo.java
index bc067d65467b8e6ba4b59320790cadbbb48b2c6f..6273c821fa979f2d90850a0c7a825287d4fff397 100644 (file)
--- a/src/org/apache/fop/fo/properties/SwitchTo.java
+++ b/src/org/apache/fop/fo/properties/SwitchTo.java
@@ -51,16 +51,15 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.NCName;
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.Iterator;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class SwitchTo extends Property  {
     public static final int dataTypes = COMPLEX;

diff --git a/src/org/apache/fop/fo/properties/TableLayout.java b/src/org/apache/fop/fo/properties/TableLayout.java
index 0f492ed348edccc4b1497329977ecf60f485dcfb..e10cc7ef15bd7f481e613783e3677608703c09c3 100644 (file)
--- a/src/org/apache/fop/fo/properties/TableLayout.java
+++ b/src/org/apache/fop/fo/properties/TableLayout.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class TableLayout extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java b/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java
index 3b34e173aa6dc204a958f4fba89cc7eb9cec420a..002ed0d8b483295f674a0ce5ce51e6ddb5b8382b 100644 (file)
--- a/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java
+++ b/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TableOmitFooterAtBreak extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java b/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java
index 001e1caf0892ae7b462dfd99b52bb9f2b3258379..e201a9c7ea87184e1faa99fa677c29ac256d866e 100644 (file)
--- a/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java
+++ b/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TableOmitHeaderAtBreak extends Property  {
     public static final int dataTypes = BOOL;

diff --git a/src/org/apache/fop/fo/properties/TargetPresentationContext.java b/src/org/apache/fop/fo/properties/TargetPresentationContext.java
index bbdd502dbd53ae802363e71c5477ca5d8e5df7d4..dd6bd2c232989835384cbd152b765a02feecc429 100644 (file)
--- a/src/org/apache/fop/fo/properties/TargetPresentationContext.java
+++ b/src/org/apache/fop/fo/properties/TargetPresentationContext.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TargetPresentationContext extends Property  {
     public static final int dataTypes = URI_SPECIFICATION | ENUM;

diff --git a/src/org/apache/fop/fo/properties/TargetProcessingContext.java b/src/org/apache/fop/fo/properties/TargetProcessingContext.java
index 89ad6942dfd5d0ad903397543567cb6e9f7eeefb..488cd19a194e7d5cda7a692a4dac9372a6ce9086 100644 (file)
--- a/src/org/apache/fop/fo/properties/TargetProcessingContext.java
+++ b/src/org/apache/fop/fo/properties/TargetProcessingContext.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TargetProcessingContext extends Property  {
     public static final int dataTypes = URI_SPECIFICATION | ENUM;

diff --git a/src/org/apache/fop/fo/properties/TargetStylesheet.java b/src/org/apache/fop/fo/properties/TargetStylesheet.java
index 31965e921a2306517347de71eb48f870f3ecd76e..4c9fa76f7534769e17f2560843ba81f2be0c9f16 100644 (file)
--- a/src/org/apache/fop/fo/properties/TargetStylesheet.java
+++ b/src/org/apache/fop/fo/properties/TargetStylesheet.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TargetStylesheet extends Property  {
     public static final int dataTypes = URI_SPECIFICATION | ENUM;

diff --git a/src/org/apache/fop/fo/properties/TextAlign.java b/src/org/apache/fop/fo/properties/TextAlign.java
index 306057b9041dc9527ff65c25e0aa99886574e180..085ac9800000ee1ee20069c80f4ac3a9299e3bc2 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextAlign.java
+++ b/src/org/apache/fop/fo/properties/TextAlign.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
 import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextAlign extends Property  {
     public static final int dataTypes = LITERAL | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextAlignLast.java b/src/org/apache/fop/fo/properties/TextAlignLast.java
index ec8f3007fbdc6119a5519eb6a04fea38520e20e2..26a662656ccf293a3a124ed540c09ec909d2e68c 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextAlignLast.java
+++ b/src/org/apache/fop/fo/properties/TextAlignLast.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextAlignLast extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextAltitude.java b/src/org/apache/fop/fo/properties/TextAltitude.java
index 0bd69947787780a1e0a9d9bc114e9eb569c8bc73..98d94a09fdb5b5034d26a2040dadd3040182d85a 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextAltitude.java
+++ b/src/org/apache/fop/fo/properties/TextAltitude.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextAltitude extends Property  {
     public static final int dataTypes = LENGTH | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextDecoration.java b/src/org/apache/fop/fo/properties/TextDecoration.java
index 1c3e081d8618d82a0f54807970879dd1b23a1aed..1061e01ce868f318cb0b089106fb0f999e0fb5f3 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextDecoration.java
+++ b/src/org/apache/fop/fo/properties/TextDecoration.java
@@ -51,22 +51,19 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.PropertyValueList;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.apache.fop.datastructs.ROStringArray;
 import org.apache.fop.datatypes.NCName;
 import org.apache.fop.datatypes.None;
 import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
 import org.apache.fop.datatypes.TextDecorations;
 import org.apache.fop.datatypes.TextDecorator;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.datastructs.ROIntArray;
-import org.apache.fop.fo.PropertyConsts;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.Property;
-
-import java.util.LinkedList;
-import java.util.Iterator;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextDecoration extends Property  {
     public static final int dataTypes = COMPLEX | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextDepth.java b/src/org/apache/fop/fo/properties/TextDepth.java
index 3d682caf308f097cbb9c82adc0c0d4dc1be6610f..e5db0ad99d0f5c8ab87225b979ff681e52ad77c3 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextDepth.java
+++ b/src/org/apache/fop/fo/properties/TextDepth.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextDepth extends Property  {
     public static final int dataTypes = LENGTH | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextIndent.java b/src/org/apache/fop/fo/properties/TextIndent.java
index 8598d6544a6b3a2b646f2ab64d5110c2ee8cc513..d93ca144a40f221f13c262b222260876e33d4980 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextIndent.java
+++ b/src/org/apache/fop/fo/properties/TextIndent.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextIndent extends Property  {
     public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextShadow.java b/src/org/apache/fop/fo/properties/TextShadow.java
index 11d70029c5a5947be7b7c3a626238a47c61974c3..630fd73170bf255da258907ff04fe4457d643a76 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextShadow.java
+++ b/src/org/apache/fop/fo/properties/TextShadow.java
@@ -51,16 +51,14 @@
  */
 package org.apache.fop.fo.properties;
 
+import java.util.Iterator;
+
 import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.ShadowEffect;
-import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.ColorNonTransparent;
-
-import java.util.Iterator;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class TextShadow extends ColorNonTransparent  {
     public static final int dataTypes = COMPLEX | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/TextTransform.java b/src/org/apache/fop/fo/properties/TextTransform.java
index ae6c2c43222265975e85fca2276f598569a942bc..77d37b3b6050640cfc9c04c21c546a3696c2d2c4 100644 (file)
--- a/src/org/apache/fop/fo/properties/TextTransform.java
+++ b/src/org/apache/fop/fo/properties/TextTransform.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class TextTransform extends Property  {
     public static final int dataTypes = ENUM | NONE | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Top.java b/src/org/apache/fop/fo/properties/Top.java
index dfb5eb32e9dd636eaf65de627ef3d3731c45b62f..6b99b16457810d94c3e2c2076c3b353cb65c2679 100644 (file)
--- a/src/org/apache/fop/fo/properties/Top.java
+++ b/src/org/apache/fop/fo/properties/Top.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Top extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/TreatAsWordSpace.java b/src/org/apache/fop/fo/properties/TreatAsWordSpace.java
index 70bcd8cf3ef8d95b61777b0ce3fa42821002043d..2a20c7eb1d3b41b9d9659cb0ca0092227f5ff66b 100644 (file)
--- a/src/org/apache/fop/fo/properties/TreatAsWordSpace.java
+++ b/src/org/apache/fop/fo/properties/TreatAsWordSpace.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class TreatAsWordSpace extends Property  {
     public static final int dataTypes = BOOL | AUTO | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/UnicodeBidi.java b/src/org/apache/fop/fo/properties/UnicodeBidi.java
index 4e756652b7e4a21ac8d3b102ffe71470b744f37a..11ef04473a2b44a340cc29ed0c9b709a8cb10e38 100644 (file)
--- a/src/org/apache/fop/fo/properties/UnicodeBidi.java
+++ b/src/org/apache/fop/fo/properties/UnicodeBidi.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class UnicodeBidi extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java b/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java
index 260dee082ca7c15b4d8e71e137c6d42a4d905536..1e2e7da4b484711f2cb4732c3610f695c4ad23d6 100644 (file)
--- a/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java
+++ b/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java
@@ -52,8 +52,6 @@
 package org.apache.fop.fo.properties;
 
 import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.properties.Property;
 
 public class UsageContextOfSuppressAtLineBreak extends Property  {
     public static final int dataTypes = AUTO | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/VerticalAlign.java b/src/org/apache/fop/fo/properties/VerticalAlign.java
index 816de067b63204cce1672e1a520d8642c6ba5fb9..c9e3b9405a59ea125d08cc612170b16d3d81e639 100644 (file)
--- a/src/org/apache/fop/fo/properties/VerticalAlign.java
+++ b/src/org/apache/fop/fo/properties/VerticalAlign.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class VerticalAlign extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/Visibility.java b/src/org/apache/fop/fo/properties/Visibility.java
index 860066f00fd1656ee3753d9f926dfa7c8d0d374c..ecb02559aa305c1752210ca4b1d43237c432c299 100644 (file)
--- a/src/org/apache/fop/fo/properties/Visibility.java
+++ b/src/org/apache/fop/fo/properties/Visibility.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Visibility extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/VoiceFamily.java b/src/org/apache/fop/fo/properties/VoiceFamily.java
index a1476beba373b438068b7d901a614aa4f895a0f8..5aeaa14c0d1baf3e6800e36a0112c0e828e9fc85 100644 (file)
--- a/src/org/apache/fop/fo/properties/VoiceFamily.java
+++ b/src/org/apache/fop/fo/properties/VoiceFamily.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class VoiceFamily extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/Volume.java b/src/org/apache/fop/fo/properties/Volume.java
index f94ab31b0fc080307f349846e3d4438ac6450b40..329256f1f6e5554fcc18850b9e511e24861a9742 100644 (file)
--- a/src/org/apache/fop/fo/properties/Volume.java
+++ b/src/org/apache/fop/fo/properties/Volume.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Volume extends Property  {
     public static final int dataTypes = AURAL;

diff --git a/src/org/apache/fop/fo/properties/WhiteSpace.java b/src/org/apache/fop/fo/properties/WhiteSpace.java
index 835065a2c3ea2aabbf434e13050f3d3a7d3380f8..b28edf9f7c900d617984e8a10944257ecc57cec2 100644 (file)
--- a/src/org/apache/fop/fo/properties/WhiteSpace.java
+++ b/src/org/apache/fop/fo/properties/WhiteSpace.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WhiteSpace extends Property  {
     public static final int dataTypes = SHORTHAND | ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java b/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java
index e1eeea0b065edb38b39aa05af7150a7a2fc738b8..06fb61f7f3d2cdf4cfb70f002e3c50a6ff486044 100644 (file)
--- a/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java
+++ b/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.Bool;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WhiteSpaceCollapse extends Property  {
     public static final int dataTypes = BOOL | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java b/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
index ad5a951bb16b061708ff8b68618d711078463644..dd0dd0023e096d8a0614d27bb2bee41b46f9a328 100644 (file)
--- a/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
+++ b/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WhiteSpaceTreatment extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Widows.java b/src/org/apache/fop/fo/properties/Widows.java
index abe3b4b013e8f208a2edd087a8ab6bfb06f1ec50..63de7c5812ca77d7ff67d6463513bc91b1c9ec37 100644 (file)
--- a/src/org/apache/fop/fo/properties/Widows.java
+++ b/src/org/apache/fop/fo/properties/Widows.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.IntegerType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class Widows extends Property  {
     public static final int dataTypes = INTEGER | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/Width.java b/src/org/apache/fop/fo/properties/Width.java
index 968eb52e08a88d8b3eb7bf14bbadeef3dd22cb18..ff3493e54ad29e595e31728d102585e780dbe71b 100644 (file)
--- a/src/org/apache/fop/fo/properties/Width.java
+++ b/src/org/apache/fop/fo/properties/Width.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class Width extends Property  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/WordSpacing.java b/src/org/apache/fop/fo/properties/WordSpacing.java
index 05b4aaadfbc59569eb41be278d782f1a3c3c39a4..22d8ac0b5a264e76aaa40e3b86bcc9eb35e39370 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacing.java
+++ b/src/org/apache/fop/fo/properties/WordSpacing.java
@@ -51,14 +51,12 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.PropNames;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.properties.WordSpacingCommon;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacing extends WordSpacingCommon  {
     public static final int dataTypes =

diff --git a/src/org/apache/fop/fo/properties/WordSpacingCommon.java b/src/org/apache/fop/fo/properties/WordSpacingCommon.java
index 7f5d6de712634c22cad5d9b6f8d239336a6fb337..a24e54b52b4494128ba00c97bc007d815d85cc69 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingCommon.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingCommon.java
@@ -51,7 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.properties.Property;
 
 public class WordSpacingCommon extends Property  {
     public static final int NORMAL = 1;

diff --git a/src/org/apache/fop/fo/properties/WordSpacingConditionality.java b/src/org/apache/fop/fo/properties/WordSpacingConditionality.java
index 269f8ae87b1eef51982148267f1932bf2eec0ba2..b7f771ade79ca29fadc1d7e9e78a68e8e310d5c2 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingConditionality.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingConditionality.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Conditionality;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacingConditionality extends Conditionality {
     public static final int dataTypes = ENUM;

diff --git a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
index 8e6a514f421d0d555337ca73197d459049342fba..5573ec4a4172ac27bfa6886a19d659903e322272 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java
@@ -51,13 +51,12 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.properties.WordSpacingCommon;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacingMaximum extends WordSpacingCommon  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
index 9fd8b233b7e877f54abcffef1779521b4d37d60e..c3a083ff25bad7ceee476a75ec6dacabb7ae2e8d 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java
@@ -51,13 +51,12 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.properties.WordSpacingCommon;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacingMinimum extends WordSpacingCommon  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
index 8ab10831e8445461546ae0879ce1792d51ed3e3e..11dbad58a88a68c481f5431a2d5e733e058f5bc5 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java
@@ -51,13 +51,12 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Numeric;
 import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.properties.WordSpacingCommon;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacingOptimum extends WordSpacingCommon  {
     public static final int dataTypes = LENGTH;

diff --git a/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java b/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java
index c62e0f3611cfbaf41de889fed8d65d63223fbc5f..bdcfe2f3c8bbe5d897258bc29f19249812d8900e 100644 (file)
--- a/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java
+++ b/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java
@@ -51,11 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.PrecedenceCommon;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WordSpacingPrecedence extends PrecedenceCommon {
     public static final int dataTypes = INTEGER | ENUM;

diff --git a/src/org/apache/fop/fo/properties/WrapOption.java b/src/org/apache/fop/fo/properties/WrapOption.java
index 09c59fd6cbc631baa098678816ef2f7f380e399b..0b244743c74c7c988720022475c798337b7558e3 100644 (file)
--- a/src/org/apache/fop/fo/properties/WrapOption.java
+++ b/src/org/apache/fop/fo/properties/WrapOption.java
@@ -51,12 +51,10 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WrapOption extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/WritingMode.java b/src/org/apache/fop/fo/properties/WritingMode.java
index 30465b500cd7b75330b848b99e8b0be6e2632650..cccd3f4a85ede696e0527511481910ac27739c39 100644 (file)
--- a/src/org/apache/fop/fo/properties/WritingMode.java
+++ b/src/org/apache/fop/fo/properties/WritingMode.java
@@ -51,16 +51,13 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.datatypes.Ints;
+import java.util.HashMap;
+
 import org.apache.fop.datatypes.EnumType;
+import org.apache.fop.datatypes.Ints;
+import org.apache.fop.datatypes.PropertyValue;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
+import org.apache.fop.fo.expr.PropertyException;
 
 public class WritingMode extends Property  {
     public static final int dataTypes = ENUM | INHERIT;

diff --git a/src/org/apache/fop/fo/properties/XmlLang.java b/src/org/apache/fop/fo/properties/XmlLang.java
index a083548c4545ce4c50d40540bf1586bc73ffd3a8..66efdfb2098f2ce4b69bb3b6db9d5cf229c80d02 100644 (file)
--- a/src/org/apache/fop/fo/properties/XmlLang.java
+++ b/src/org/apache/fop/fo/properties/XmlLang.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class XmlLang extends Property  {
     public static final int dataTypes = SHORTHAND;

diff --git a/src/org/apache/fop/fo/properties/ZIndex.java b/src/org/apache/fop/fo/properties/ZIndex.java
index 5fac72502ca6c26d4fc47903ab0fa2947ce56a16..99cea6da94a7eaddd40c80719c0c15a1cb115d89 100644 (file)
--- a/src/org/apache/fop/fo/properties/ZIndex.java
+++ b/src/org/apache/fop/fo/properties/ZIndex.java
@@ -51,8 +51,6 @@
  */
 package org.apache.fop.fo.properties;
 
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.properties.Property;
 
 public class ZIndex extends Property  {
     public static final int dataTypes =INTEGER | AUTO | INHERIT;

diff --git a/src/org/apache/fop/tools/DocumentInputSource.java b/src/org/apache/fop/tools/DocumentInputSource.java
index a9430fd34100167c124b813616dd73762eb078a2..7b691454dd0be50c76b0da3190db66047573b172 100644 (file)
--- a/src/org/apache/fop/tools/DocumentInputSource.java
+++ b/src/org/apache/fop/tools/DocumentInputSource.java
@@ -52,9 +52,8 @@
 
 package org.apache.fop.tools;
 
-import java.util.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
 
 /**
  * This is an InputSource to be used with DocumentReader.

diff --git a/src/org/apache/fop/tools/DocumentReader.java b/src/org/apache/fop/tools/DocumentReader.java
index 41d41a51a655d19d56bd78ee9444828efbc3acd7..cef501ce7e9d0e4f25757ba81ef4407cc0a75f20 100644 (file)
--- a/src/org/apache/fop/tools/DocumentReader.java
+++ b/src/org/apache/fop/tools/DocumentReader.java
@@ -53,13 +53,20 @@
 package org.apache.fop.tools;
 
 import java.io.IOException;
-// import java.util.*;
 
-// DOM
-import org.w3c.dom.*;
-
-// SAX
-import org.xml.sax.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.AttributesImpl;
 
 /**

diff --git a/src/org/apache/fop/xml/FoXMLEvent.java b/src/org/apache/fop/xml/FoXMLEvent.java
index 49030c8d3a4b16705384c932c6c90d9142d61633..64691c2bfeb7df28eebc71113b19b0c6e4b34b36 100644 (file)
--- a/src/org/apache/fop/xml/FoXMLEvent.java
+++ b/src/org/apache/fop/xml/FoXMLEvent.java
@@ -53,11 +53,11 @@
  */
 package org.apache.fop.xml;
 
+import org.xml.sax.helpers.AttributesImpl;
+
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FObjectNames;
 
-import org.xml.sax.helpers.AttributesImpl;
-
 /**
  * This is a data class to encapsulate the data of an individual XML
  * parse event in an XML-FO file. The current version, while defining

diff --git a/src/org/apache/fop/xml/FoXMLEventPool.java b/src/org/apache/fop/xml/FoXMLEventPool.java
index c1095f9a69cdb1755874880c5f535e9beb4ef977..47124ae6e2705e4bccc1ba07b8e4a5ee1c01581f 100644 (file)
--- a/src/org/apache/fop/xml/FoXMLEventPool.java
+++ b/src/org/apache/fop/xml/FoXMLEventPool.java
@@ -53,11 +53,7 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.xml.XMLEventPool;
 
 /**
  * This class provides a pool of <tt>FoXMLEvent</tt> objects.

diff --git a/src/org/apache/fop/xml/FoXMLSerialHandler.java b/src/org/apache/fop/xml/FoXMLSerialHandler.java
index 11c4f3996e5b7dba473354e8b137a648defaeb1d..49674a8a86c3257a906e8d38c8881e4c052f5513 100644 (file)
--- a/src/org/apache/fop/xml/FoXMLSerialHandler.java
+++ b/src/org/apache/fop/xml/FoXMLSerialHandler.java
@@ -54,23 +54,18 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.XMLNamespaces;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.xml.FoXMLEventPool;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Driver;
-import org.apache.fop.configuration.Configuration;
+import java.util.NoSuchElementException;
 
-import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
 import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.DefaultHandler;
 
-import java.io.IOException;
-import java.util.NoSuchElementException;
+import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.configuration.Configuration;
+import org.apache.fop.fo.FObjectNames;
 
 /**
  * <tt>FoXMLSerialHandler</tt> is the <tt>ContentHandler</tt> for the

diff --git a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
index d25d74b54905e1bc203039e3f9fa136081fa06aa..7dfab39514d8e7e306e81fe15e9f10923c6165af 100644 (file)
--- a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
+++ b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java
@@ -55,18 +55,16 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.datastructs.SyncedCircularBuffer;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.datastructs.SyncedCircularBuffer;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjectSets;
 
-import org.apache.fop.xml.FoXMLEventPool;
-
-import java.util.NoSuchElementException;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.util.BitSet;
-
 /**
  * A synchronized circular buffer for FoXMLEvents.
  * @see org.apache.fop.datastructs.SyncedCircularBuffer

diff --git a/src/org/apache/fop/xml/XMLEvent.java b/src/org/apache/fop/xml/XMLEvent.java
index 2fc8be27380f3ad1deef10ea2a4d5f422b181cbb..e300a720bd32e8dd23c6375744a3c25362d12322 100644 (file)
--- a/src/org/apache/fop/xml/XMLEvent.java
+++ b/src/org/apache/fop/xml/XMLEvent.java
@@ -53,8 +53,6 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.apps.FOPException;
-
 import org.xml.sax.helpers.AttributesImpl;
 
 /**
@@ -257,9 +255,9 @@ public class XMLEvent {
 
     /**
      * Set the qualified name of this event.
-     * @param QName - the qualified name.
+     * @param qName - the qualified name.
      */
-    public void setQName(String QName) {
+    public void setQName(String qName) {
         this.qName = qName;
     }
 

diff --git a/src/org/apache/fop/xml/XMLEventPool.java b/src/org/apache/fop/xml/XMLEventPool.java
index 763c5fafeac3ea38871f1bf1e563c4c6de77f01a..18dab6fda6e89e851c27c9fd0fdf6a67229d013f 100644 (file)
--- a/src/org/apache/fop/xml/XMLEventPool.java
+++ b/src/org/apache/fop/xml/XMLEventPool.java
@@ -53,13 +53,11 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.messaging.MessageHandler;
-
 import java.util.ArrayList;
 import java.util.BitSet;
 
+import org.apache.fop.messaging.MessageHandler;
+
 /**
  * This class provides a pool of <tt>XMLEvent</tt> objects.
  */

diff --git a/src/org/apache/fop/xml/XMLNamespaces.java b/src/org/apache/fop/xml/XMLNamespaces.java
index 49b1889f87316fc57a7cd948f4cae64ccb7af3c3..0aa77cc327f073f6979701505db80ebeea844db4 100644 (file)
--- a/src/org/apache/fop/xml/XMLNamespaces.java
+++ b/src/org/apache/fop/xml/XMLNamespaces.java
@@ -53,10 +53,10 @@
  */
 package org.apache.fop.xml;
 
-import org.apache.fop.datatypes.Ints;
-
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.apache.fop.datatypes.Ints;
 
 /**
  * Maintains the namespaces encountered by an invocation of