cvs commit: xml-fop/src/org/apache/fop/fo FONode.java FOTree.java

2002-10-24 Thread pbwest 
pbwest  2002/10/24 07:51:53

  Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FOTree.java
  Log:
  Changed XMLEvent to FoXMLEvent throughout.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.19.2.19 +7 -7  xml-fop/src/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.19.2.18
  retrieving revision 1.19.2.19
  diff -u -r1.19.2.18 -r1.19.2.19
  --- FONode.java   21 Oct 2002 15:43:26 -  1.19.2.18
  +++ FONode.java   24 Oct 2002 14:51:52 -  1.19.2.19
  @@ -16,8 +16,8 @@
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.datastructs.ROBitSet;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.xml.XMLEvent;
  -import org.apache.fop.xml.SyncedXmlEventsBuffer;
  +import org.apache.fop.xml.FoXMLEvent;
  +import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
   import org.apache.fop.xml.XMLNamespaces;
   import org.apache.fop.messaging.MessageHandler;
   
  @@ -55,9 +55,9 @@
   /** The parent ttFONode/tt of this node. */
   protected FONode parent;
   /** The ttXMLEvent/tt which triggered this node. */
  -protected XMLEvent event;
  +protected FoXMLEvent event;
   /** The buffer from which parser events are drawn. */
  -protected SyncedXmlEventsBuffer xmlevents;
  +protected SyncedFoXmlEventsBuffer xmlevents;
   /** The namespaces object associated with ixmlevents/i. */
   protected XMLNamespaces namespaces;
   /** The FO type. */
  @@ -101,7 +101,7 @@
* node
*/
   public FONode
  -(FOTree foTree, int type, FONode parent, XMLEvent event, int attrSet)
  +(FOTree foTree, int type, FONode parent, FoXMLEvent event, int attrSet)
   throws Tree.TreeException, FOPException, PropertyException
   {
   foTree.super(parent);
  
  
  
  1.1.2.20  +7 -7  xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
  
  Index: FOTree.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
  retrieving revision 1.1.2.19
  retrieving revision 1.1.2.20
  diff -u -r1.1.2.19 -r1.1.2.20
  --- FOTree.java   21 Oct 2002 15:45:30 -  1.1.2.19
  +++ FOTree.java   24 Oct 2002 14:51:53 -  1.1.2.20
  @@ -4,9 +4,9 @@
   import org.apache.fop.datatypes.Ints;
   import org.apache.fop.datatypes.Numeric;
   import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.xml.XMLEvent;
  +import org.apache.fop.xml.FoXMLEvent;
   import org.apache.fop.xml.XMLNamespaces;
  -import org.apache.fop.xml.SyncedXmlEventsBuffer;
  +import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
   import org.apache.fop.apps.Driver;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.configuration.Configuration;
  @@ -50,7 +50,7 @@
* The buffer from which the ttXMLEvent/tts from the parser will
* be read.  ttprotected/tt so that FONode can access it.
*/
  -SyncedXmlEventsBuffer xmlevents;
  +SyncedFoXmlEventsBuffer xmlevents;
   private Thread parserThread;
   private boolean errorDump;
   
  @@ -65,7 +65,7 @@
* @param xmlevents the buffer from which ttXMLEvent/tts from the
* parser are read.
*/
  -public FOTree(SyncedXmlEventsBuffer xmlevents)
  +public FOTree(SyncedFoXmlEventsBuffer xmlevents)
   throws PropertyException
   {
   super();
  @@ -112,7 +112,7 @@
*/
   public void run() {
   FoRoot foRoot;
  -XMLEvent event;
  +FoXMLEvent event;
   try {
   // Dummy only - check the language and country setup
   System.out.println((String)Configuration.getHashMapEntry
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/org/apache/fop/fo FONode.java FOTree.java Properties.java PropertyConsts.java PropertySets.java

2002-09-18 Thread pbwest 

pbwest  2002/09/18 08:42:13

  Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FOTree.java Properties.java PropertyConsts.java
PropertySets.java
  Log:
  Changes to import names.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.19.2.8  +6 -6  xml-fop/src/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.19.2.7
  retrieving revision 1.19.2.8
  diff -u -r1.19.2.7 -r1.19.2.8
  --- FONode.java   18 Sep 2002 06:01:51 -  1.19.2.7
  +++ FONode.java   18 Sep 2002 15:42:12 -  1.19.2.8
  @@ -5,11 +5,11 @@
   import org.apache.fop.fo.FObjects;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.expr.PropertyParser;
  -import org.apache.fop.fo.expr.PropertyValue;
  -import org.apache.fop.fo.expr.PropertyValueList;
  -import org.apache.fop.fo.expr.PropertyTriplet;
  +import org.apache.fop.datatypes.PropertyValue;
  +import org.apache.fop.datatypes.PropertyValueList;
  +import org.apache.fop.datatypes.PropertyTriplet;
   import org.apache.fop.datastructs.Tree;
  -import org.apache.fop.datatypes.Inherit;
  +import org.apache.fop.datatypes.indirect.Inherit;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.xml.XMLEvent;
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
  
  
  
  1.1.2.11  +5 -5  xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
  
  Index: FOTree.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- FOTree.java   18 Sep 2002 06:06:24 -  1.1.2.10
  +++ FOTree.java   18 Sep 2002 15:42:12 -  1.1.2.11
  @@ -3,7 +3,7 @@
   import org.apache.fop.datastructs.Tree;
   import org.apache.fop.datatypes.Ints;
   import org.apache.fop.datatypes.Numeric;
  -import org.apache.fop.datatypes.Inherit;
  +import org.apache.fop.datatypes.indirect.Inherit;
   import org.apache.fop.datatypes.Auto;
   import org.apache.fop.datatypes.None;
   import org.apache.fop.datatypes.TextDecorations;
  @@ -16,8 +16,8 @@
   import org.apache.fop.fo.Properties;
   import org.apache.fop.fo.PropertyConsts;
   import org.apache.fop.fo.PropNames;
  -import org.apache.fop.fo.expr.PropertyValue;
  -import org.apache.fop.fo.expr.PropertyTriplet;
  +import org.apache.fop.datatypes.PropertyValue;
  +import org.apache.fop.datatypes.PropertyTriplet;
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.expr.PropertyParser;
   
  
  
  
  1.1.2.24  +11 -10xml-fop/src/org/apache/fop/fo/Attic/Properties.java
  
  Index: Properties.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -r1.1.2.23 -r1.1.2.24
  --- Properties.java   15 Sep 2002 05:00:54 -  1.1.2.23
  +++ Properties.java   18 Sep 2002 15:42:12 -  1.1.2.24
  @@ -25,9 +25,9 @@
   import org.apache.fop.fo.PropertyConsts;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.fo.FObjects;
  -import org.apache.fop.fo.expr.PropertyValue;
  -import org.apache.fop.fo.expr.AbstractPropertyValue;
  -import org.apache.fop.fo.expr.PropertyValueList;
  +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;
  @@ -53,15 +53,15 @@
   import org.apache.fop.datatypes.Literal;
   import org.apache.fop.datatypes.Auto;
   import org.apache.fop.datatypes.None;
  -import org.apache.fop.datatypes.Inherit;
   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.FromParent;
  -import org.apache.fop.datatypes.FromNearestSpecified;
   import org.apache.fop.datatypes.Slash;
  +import org.apache.fop.datatypes.indirect.Inherit;
  +import org.apache.fop.datatypes.indirect.FromParent;
  +import org.apache.fop.datatypes.indirect.FromNearestSpecified;
   
   /**
* Parent class for all of the individual property classes.  It also contains
  @@ -4385,7 +4385,8 @@
   // First, check that we have a list
   if (type != PropertyValue.LIST) {
   if ( ! nested  type == PropertyValue.INHERIT)