foray-commit — FOray repository commit log messages

[FOray-commit] SF.net SVN: foray: [7536] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7536
Author:   victormote
Date:     2006-06-12 10:42:27 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7536&view=rev

Log Message:
-----------
Rename parameters for consistency and clarity.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	2006-06-12 17:33:37 UTC (rev 7535)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	2006-06-12 17:42:27 UTC (rev 7536)
@@ -34,9 +34,7 @@
 
 /**
  * <p>Handles linkage to the FO Tree for the specialized case of fo:marker
- * descendants.
- * This class provides the mechanism for those multiple occurences to be
- * tracked properly.</p>
+ * descendants, which can be laid out multiple times in the AreaTree.</p>
  */
 public class FOLinkageMarker extends FOLinkage {
 
@@ -70,14 +68,14 @@
      */
     private HashMap map = new HashMap();
 
-    public FOLinkageMarker(FONode realFObj) throws AreaWException {
-        super(realFObj);
-        Marker marker = realFObj.ancestorMarker();
+    public FOLinkageMarker(FONode foGenerator) throws AreaWException {
+        super(foGenerator);
+        Marker marker = foGenerator.ancestorMarker();
         if (marker == null) {
             throw new AreaWException("(FOray) FOLinkageMarker construction "
                     + "attempted for object\n"
                     + "  not descended from an fo:marker:\n"
-                    + realFObj.getContextMessage());
+                    + foGenerator.getContextMessage());
         }
     }
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	2006-06-12 17:33:37 UTC (rev 7535)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	2006-06-12 17:42:27 UTC (rev 7536)
@@ -45,8 +45,8 @@
      */
     private ArrayList generatedAreas = new ArrayList();
 
-    public FOLinkageNormal(FONode realFObj) {
-        super(realFObj);
+    public FOLinkageNormal(FONode foGenerator) {
+        super(foGenerator);
     }
 
     public void registerGeneratedArea(AreaNode areaNode) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7535] trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java

[<vic...@us...>]

Revision: 7535
Author:   victormote
Date:     2006-06-12 10:33:37 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7535&view=rev

Log Message:
-----------
1. Rework to handle new linkage abstraction.
2. Add doc to clarify the data.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	2006-06-12 15:45:48 UTC (rev 7534)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	2006-06-12 17:33:37 UTC (rev 7535)
@@ -24,28 +24,71 @@
 
 package org.foray.area;
 
+import org.axsl.areaW.AreaWException;
+import org.axsl.areaW.PageArea;
 import org.axsl.foR.FONode;
-import org.axsl.foR.FONodeResult;
+import org.axsl.foR.fo.Marker;
+import org.axsl.foR.fo.RetrieveMarker;
 
 import java.util.HashMap;
 
 /**
- * A collection of {@link FOLinkageNormal} instances keyed by the
- * retrieve-marker item that is their "parent".
+ * <p>Handles linkage to the FO Tree for the specialized case of fo:marker
+ * descendants.
+ * This class provides the mechanism for those multiple occurences to be
+ * tracked properly.</p>
  */
-public class FOLinkageMarker extends HashMap implements FONodeResult {
+public class FOLinkageMarker extends FOLinkage {
 
-    static final long serialVersionUID = 632226032801502694L;
+    /**
+     * <p>Map whose key is a {@link RetrieveMarker} instance, and whose value
+     * is an {@link FOLinkageNormal} instance.</p>
+     *
+     * <p>An fo:marker can be grafted to multiple fo:retrieve-marker instances,
+     * and can therefore be laid out in the Area Tree multiple times.
+     * Similarly, an fo:retrieve-marker instance may be conceptually replaced
+     * by multiple fo:marker instances.
+     * So there is a many-to-many relationship between fo:marker and
+     * fo:retrieve-marker.
+     * We need the ability to track the Areas generated by each unique
+     * combination of {@link Marker} and {@link RetrieveMarker}.
+     * (Although the content resulting from the marker/retrieve-marker
+     * combination may appear on multiple pages, it only gets laid out once
+     * into the static-content flow, and therefore there is no need for the
+     * {@link PageArea} to be part of the key).</p>
+     *
+     * <p>Now, since the conceptual key is the combination of marker and
+     * retrieve-marker, we must explain why only the {@link RetrieveMarker} is
+     * used as the key to this Map.
+     * Answer: it is unnecessary, because the {@link Marker} instance is implied
+     * in this's {@link FOLinkage#getFONode()}.</p>
+     *
+     * <p>The value of the Map is an {@link FOLinkageNormal} just as would be
+     * used to store the linkage information for non-marker content.
+     * So the net effect is that we have forced a {@link RetrieveMarker} into
+     * the key that tracks this content.</p>
+     */
+    private HashMap map = new HashMap();
 
-    /** The FONode. */
-    private FONode realFONode;
-
-    public FOLinkageMarker(FONode realFObj) {
-        this.realFONode = realFObj;
+    public FOLinkageMarker(FONode realFObj) throws AreaWException {
+        super(realFObj);
+        Marker marker = realFObj.ancestorMarker();
+        if (marker == null) {
+            throw new AreaWException("(FOray) FOLinkageMarker construction "
+                    + "attempted for object\n"
+                    + "  not descended from an fo:marker:\n"
+                    + realFObj.getContextMessage());
+        }
     }
 
-    public FONode getFONode() {
-        return this.realFONode;
+    public FOLinkageNormal getNormalLinkage(RetrieveMarker retrieveMarker) {
+        Object object = this.map.get(retrieveMarker);
+        if (object != null) {
+            return (FOLinkageNormal) object;
+        }
+        FOLinkageNormal newLinkage = new FOLinkageNormal(this.getFONode());
+        this.map.put(retrieveMarker, newLinkage);
+        return newLinkage;
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7534] trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java

[<vic...@us...>]

Revision: 7534
Author:   victormote
Date:     2006-06-12 08:45:48 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7534&view=rev

Log Message:
-----------
Conform to axsl change: Add method to get the ancestor fo:marker object.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java	2006-06-12 15:23:59 UTC (rev 7533)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java	2006-06-12 15:45:48 UTC (rev 7534)
@@ -153,4 +153,18 @@
                 + "    (Line " + line + ", Column " + column + ")";
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public org.axsl.foR.fo.Marker ancestorMarker() {
+        FObj parent = this.realParent();
+        if (parent == null) {
+            return null;
+        }
+        if (parent instanceof Marker) {
+            return (Marker) parent;
+        }
+        return parent.ancestorMarker();
+    }
+    
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7533] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7533
Author:   victormote
Date:     2006-06-12 08:23:59 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7533&view=rev

Log Message:
-----------
Add new abstract superclass for linkage items, and a subclass for the specialized case of Markers.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java

Added Paths:
-----------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
Added: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	                        (rev 0)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	2006-06-12 15:23:59 UTC (rev 7533)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2006 The FOray Project.
+ *      http://www.foray.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+package org.foray.area;
+
+import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
+
+/**
+ * Abstract superclass for classes that handle the linkage between the FO Tree
+ * and the Area Tree.
+ */
+public abstract class FOLinkage implements FONodeResult {
+
+    /** The FONode for which this linkage tracks Area generation. */
+    private FONode foGenerator;
+
+    public FOLinkage(FONode foGenerator) {
+        this.foGenerator = foGenerator;
+    }
+
+    public FONode getFONode() {
+        return this.foGenerator;
+    }
+
+}


Property changes on: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	                        (rev 0)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java	2006-06-12 15:23:59 UTC (rev 7533)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2006 The FOray Project.
+ *      http://www.foray.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+package org.foray.area;
+
+import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
+
+import java.util.HashMap;
+
+/**
+ * A collection of {@link FOLinkageNormal} instances keyed by the
+ * retrieve-marker item that is their "parent".
+ */
+public class FOLinkageMarker extends HashMap implements FONodeResult {
+
+    static final long serialVersionUID = 632226032801502694L;
+
+    /** The FONode. */
+    private FONode realFONode;
+
+    public FOLinkageMarker(FONode realFObj) {
+        this.realFONode = realFObj;
+    }
+
+    public FONode getFONode() {
+        return this.realFONode;
+    }
+
+}


Property changes on: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	2006-06-12 15:14:48 UTC (rev 7532)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	2006-06-12 15:23:59 UTC (rev 7533)
@@ -27,7 +27,6 @@
 import org.axsl.areaW.Area;
 import org.axsl.areaW.AreaNode;
 import org.axsl.foR.FONode;
-import org.axsl.foR.FONodeResult;
 
 import java.util.ArrayList;
 
@@ -35,27 +34,21 @@
  * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
  * with the FOray AreaTree.</p>
  */
-public class FOLinkageNormal implements FONodeResult {
+public class FOLinkageNormal extends FOLinkage {
 
-    /** The FONode which generated the Areas in {@link #generatedAreas}. */
-    private FONode realFONode;
-
     /**
-     * The ordered list of Area instances generated by {@link #realFONode}.
+     * The ordered list of Area instances generated by
+     * {@link FOLinkage#getFONode()}.
      * Index 0 "is-first" and Index size() - 1 "is-last".
      * This is currently set up to only store the root node of any subtree that
-     * was generated by {@link #realFONode}.
+     * was generated by {@link FOLinkage#getFONode()}.
      */
     private ArrayList generatedAreas = new ArrayList();
 
     public FOLinkageNormal(FONode realFObj) {
-        this.realFONode = realFObj;
+        super(realFObj);
     }
 
-    public FONode getFONode() {
-        return this.realFONode;
-    }
-
     public void registerGeneratedArea(AreaNode areaNode) {
         AreaNode parent = areaNode.getWritableParent();
         if (parent != null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7532] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7532
Author:   victormote
Date:     2006-06-12 08:14:48 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7532&view=rev

Log Message:
-----------
Oops. Rename it again.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java

Added Paths:
-----------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java

Removed Paths:
-------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 15:05:56 UTC (rev 7531)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 15:14:48 UTC (rev 7532)
@@ -50,7 +50,7 @@
     /*
      * The "generated-by" trait, as defined in Section 6.1.1.
      */
-    protected FOLinkage generatedBy;
+    protected FOLinkageNormal generatedBy;
 
     /**
      * Constructor.
@@ -92,13 +92,13 @@
         this.children.remove(areaNode);
     }
 
-    protected FOLinkage linkage(FONode foNode) {
+    protected FOLinkageNormal linkage(FONode foNode) {
         if (foNode == null) {
             return null;
         }
-        FOLinkage linkage = (FOLinkage) foNode.getResult();
+        FOLinkageNormal linkage = (FOLinkageNormal) foNode.getResult();
         if (linkage == null) {
-            linkage = new FOLinkage(foNode);
+            linkage = new FOLinkageNormal(foNode);
             foNode.setResult(linkage);
         }
         return linkage;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 15:05:56 UTC (rev 7531)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 15:14:48 UTC (rev 7532)
@@ -115,7 +115,7 @@
     }
 
     public Root getRoot() {
-        FOLinkage linkage = this.generatedBy;
+        FOLinkageNormal linkage = this.generatedBy;
         /* Cast verified at construction. */
         return (Root) linkage.getFONode();
     }
@@ -178,7 +178,7 @@
      */
     public Area firstNormalAreaReturned(String id) {
         FObj fobj = retrieveId(id);
-        FOLinkage proxy = linkage(fobj);
+        FOLinkageNormal proxy = linkage(fobj);
         return proxy.firstNormalAreaReturned();
     }
 

Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	2006-06-12 15:05:56 UTC (rev 7531)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	2006-06-12 15:14:48 UTC (rev 7532)
@@ -1,198 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/* $Id$ */
-
-package org.foray.area;
-
-import org.axsl.areaW.Area;
-import org.axsl.areaW.AreaNode;
-import org.axsl.foR.FONode;
-import org.axsl.foR.FONodeResult;
-
-import java.util.ArrayList;
-
-/**
- * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
- * with the FOray AreaTree.</p>
- */
-public class FOLinkage implements FONodeResult {
-
-    /** The FONode which generated the Areas in {@link #generatedAreas}. */
-    private FONode realFONode;
-
-    /**
-     * The ordered list of Area instances generated by {@link #realFONode}.
-     * Index 0 "is-first" and Index size() - 1 "is-last".
-     * This is currently set up to only store the root node of any subtree that
-     * was generated by {@link #realFONode}.
-     */
-    private ArrayList generatedAreas = new ArrayList();
-
-    public FOLinkage(FONode realFObj) {
-        this.realFONode = realFObj;
-    }
-
-    public FONode getFONode() {
-        return this.realFONode;
-    }
-
-    public void registerGeneratedArea(AreaNode areaNode) {
-        AreaNode parent = areaNode.getWritableParent();
-        if (parent != null) {
-            /*
-             * If the parent was generated by the same FObj, then we shouldn't
-             * register this one also.
-             */
-            if (areaNode.traitGeneratedBy() == parent.traitGeneratedBy()) {
-                return;
-            }
-        }
-        if (generatedAreas == null) {
-            generatedAreas = new ArrayList();
-        }
-        generatedAreas.add(areaNode);
-    }
-
-    public void unregisterGeneratedArea(AreaNode areaNode) {
-        generatedAreas.remove(areaNode);
-    }
-
-    public AreaNode getFirstGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        return (AreaNode) generatedAreas.get(0);
-    }
-
-    public AreaNode getPreviousGeneratedBy(AreaNode area) {
-        if (generatedAreas == null) {
-            return null;
-        }
-        int index = generatedAreas.indexOf(area);
-        if (index > 0) {
-            return (AreaNode) generatedAreas.get(index - 1);
-        }
-        return null;
-    }
-
-    public AreaNode getNextGeneratedBy(AreaNode area) {
-        if (generatedAreas == null) {
-            return null;
-        }
-        int index = generatedAreas.indexOf(area);
-        if (index > 0 && index < generatedAreas.size() - 1) {
-            return (AreaNode) generatedAreas.get(index + 1);
-        }
-        return null;
-    }
-
-    /**
-     * @param area An Area instance.
-     * @return True iff area is the first Area generated by this.
-     */
-    public boolean isFirstGeneratedBy(AreaNode area) {
-        if (generatedAreas.indexOf(area) == 0) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param area An Area instance.
-     * @return True iff area is the first Area generated by this.
-     */
-    public boolean isLastGeneratedBy(AreaNode area) {
-        if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return The current count of areas that have been generated by the FObj.
-     */
-    public int qtyAreasGenerated() {
-        return this.generatedAreas.size();
-    }
-
-    /**
-     * @return The last AreaNode generated by the parent FObj.
-     */
-    public AreaNode getLastGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        return (AreaNode) generatedAreas.get(generatedAreas.size() - 1);
-    }
-
-    /**
-     * @return The last Area generated by the parent FObj.
-     */
-    public Area getLastAreaGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        for (int i = generatedAreas.size() - 1; i >= 0; i--) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-    public Area firstNormalAreaReturned() {
-        /*
-         * TODO: This is not right, but will do for now. It is not considering
-         * areas that are returned by the FO but not generated by it.
-         */
-        if (generatedAreas == null) {
-            return null;
-        }
-        for (int i = 0; i < generatedAreas.size(); i ++) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-    public Area lastNormalAreaReturned() {
-        /*
-         * TODO: This is not right, but will do for now. It is not considering
-         * areas that are returned by the FO but not generated by it.
-         */
-        if (generatedAreas == null) {
-            return null;
-        }
-        for (int i = generatedAreas.size() - 1; i >= 0; i --) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-}

Copied: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java (from rev 7531, trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java)
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	                        (rev 0)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java	2006-06-12 15:14:48 UTC (rev 7532)
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2004 The FOray Project.
+ *      http://www.foray.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+package org.foray.area;
+
+import org.axsl.areaW.Area;
+import org.axsl.areaW.AreaNode;
+import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
+
+import java.util.ArrayList;
+
+/**
+ * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
+ * with the FOray AreaTree.</p>
+ */
+public class FOLinkageNormal implements FONodeResult {
+
+    /** The FONode which generated the Areas in {@link #generatedAreas}. */
+    private FONode realFONode;
+
+    /**
+     * The ordered list of Area instances generated by {@link #realFONode}.
+     * Index 0 "is-first" and Index size() - 1 "is-last".
+     * This is currently set up to only store the root node of any subtree that
+     * was generated by {@link #realFONode}.
+     */
+    private ArrayList generatedAreas = new ArrayList();
+
+    public FOLinkageNormal(FONode realFObj) {
+        this.realFONode = realFObj;
+    }
+
+    public FONode getFONode() {
+        return this.realFONode;
+    }
+
+    public void registerGeneratedArea(AreaNode areaNode) {
+        AreaNode parent = areaNode.getWritableParent();
+        if (parent != null) {
+            /*
+             * If the parent was generated by the same FObj, then we shouldn't
+             * register this one also.
+             */
+            if (areaNode.traitGeneratedBy() == parent.traitGeneratedBy()) {
+                return;
+            }
+        }
+        if (generatedAreas == null) {
+            generatedAreas = new ArrayList();
+        }
+        generatedAreas.add(areaNode);
+    }
+
+    public void unregisterGeneratedArea(AreaNode areaNode) {
+        generatedAreas.remove(areaNode);
+    }
+
+    public AreaNode getFirstGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        return (AreaNode) generatedAreas.get(0);
+    }
+
+    public AreaNode getPreviousGeneratedBy(AreaNode area) {
+        if (generatedAreas == null) {
+            return null;
+        }
+        int index = generatedAreas.indexOf(area);
+        if (index > 0) {
+            return (AreaNode) generatedAreas.get(index - 1);
+        }
+        return null;
+    }
+
+    public AreaNode getNextGeneratedBy(AreaNode area) {
+        if (generatedAreas == null) {
+            return null;
+        }
+        int index = generatedAreas.indexOf(area);
+        if (index > 0 && index < generatedAreas.size() - 1) {
+            return (AreaNode) generatedAreas.get(index + 1);
+        }
+        return null;
+    }
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isFirstGeneratedBy(AreaNode area) {
+        if (generatedAreas.indexOf(area) == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isLastGeneratedBy(AreaNode area) {
+        if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return The current count of areas that have been generated by the FObj.
+     */
+    public int qtyAreasGenerated() {
+        return this.generatedAreas.size();
+    }
+
+    /**
+     * @return The last AreaNode generated by the parent FObj.
+     */
+    public AreaNode getLastGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        return (AreaNode) generatedAreas.get(generatedAreas.size() - 1);
+    }
+
+    /**
+     * @return The last Area generated by the parent FObj.
+     */
+    public Area getLastAreaGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        for (int i = generatedAreas.size() - 1; i >= 0; i--) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+    public Area firstNormalAreaReturned() {
+        /*
+         * TODO: This is not right, but will do for now. It is not considering
+         * areas that are returned by the FO but not generated by it.
+         */
+        if (generatedAreas == null) {
+            return null;
+        }
+        for (int i = 0; i < generatedAreas.size(); i ++) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+    public Area lastNormalAreaReturned() {
+        /*
+         * TODO: This is not right, but will do for now. It is not considering
+         * areas that are returned by the FO but not generated by it.
+         */
+        if (generatedAreas == null) {
+            return null;
+        }
+        for (int i = generatedAreas.size() - 1; i >= 0; i --) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+}

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 15:05:56 UTC (rev 7531)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 15:14:48 UTC (rev 7532)
@@ -531,7 +531,7 @@
      */
     private boolean startsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOLinkage proxy = linkage(parent);
+        FOLinkageNormal proxy = linkage(parent);
         Area firstArea = (Area) proxy.firstNormalAreaReturned();
         if (firstArea == null) {
             return false;
@@ -548,7 +548,7 @@
      */
     private boolean endsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOLinkage proxy = linkage(parent);
+        FOLinkageNormal proxy = linkage(parent);
         Area lastArea = (Area) proxy.lastNormalAreaReturned();
         if (lastArea == null) {
             return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7531] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7531
Author:   victormote
Date:     2006-06-12 08:05:56 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7531&view=rev

Log Message:
-----------
Rename class for future expansion.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java

Added Paths:
-----------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java

Removed Paths:
-------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:56:38 UTC (rev 7530)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 15:05:56 UTC (rev 7531)
@@ -50,7 +50,7 @@
     /*
      * The "generated-by" trait, as defined in Section 6.1.1.
      */
-    protected FOrayFOLinkage generatedBy;
+    protected FOLinkage generatedBy;
 
     /**
      * Constructor.
@@ -92,13 +92,13 @@
         this.children.remove(areaNode);
     }
 
-    protected FOrayFOLinkage linkage(FONode foNode) {
+    protected FOLinkage linkage(FONode foNode) {
         if (foNode == null) {
             return null;
         }
-        FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult();
+        FOLinkage linkage = (FOLinkage) foNode.getResult();
         if (linkage == null) {
-            linkage = new FOrayFOLinkage(foNode);
+            linkage = new FOLinkage(foNode);
             foNode.setResult(linkage);
         }
         return linkage;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 14:56:38 UTC (rev 7530)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 15:05:56 UTC (rev 7531)
@@ -115,7 +115,7 @@
     }
 
     public Root getRoot() {
-        FOrayFOLinkage linkage = this.generatedBy;
+        FOLinkage linkage = this.generatedBy;
         /* Cast verified at construction. */
         return (Root) linkage.getFONode();
     }
@@ -178,7 +178,7 @@
      */
     public Area firstNormalAreaReturned(String id) {
         FObj fobj = retrieveId(id);
-        FOrayFOLinkage proxy = linkage(fobj);
+        FOLinkage proxy = linkage(fobj);
         return proxy.firstNormalAreaReturned();
     }
 

Copied: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java (from rev 7529, trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java)
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	                        (rev 0)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java	2006-06-12 15:05:56 UTC (rev 7531)
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2004 The FOray Project.
+ *      http://www.foray.org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ *      Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/* $Id$ */
+
+package org.foray.area;
+
+import org.axsl.areaW.Area;
+import org.axsl.areaW.AreaNode;
+import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
+
+import java.util.ArrayList;
+
+/**
+ * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
+ * with the FOray AreaTree.</p>
+ */
+public class FOLinkage implements FONodeResult {
+
+    /** The FONode which generated the Areas in {@link #generatedAreas}. */
+    private FONode realFONode;
+
+    /**
+     * The ordered list of Area instances generated by {@link #realFONode}.
+     * Index 0 "is-first" and Index size() - 1 "is-last".
+     * This is currently set up to only store the root node of any subtree that
+     * was generated by {@link #realFONode}.
+     */
+    private ArrayList generatedAreas = new ArrayList();
+
+    public FOLinkage(FONode realFObj) {
+        this.realFONode = realFObj;
+    }
+
+    public FONode getFONode() {
+        return this.realFONode;
+    }
+
+    public void registerGeneratedArea(AreaNode areaNode) {
+        AreaNode parent = areaNode.getWritableParent();
+        if (parent != null) {
+            /*
+             * If the parent was generated by the same FObj, then we shouldn't
+             * register this one also.
+             */
+            if (areaNode.traitGeneratedBy() == parent.traitGeneratedBy()) {
+                return;
+            }
+        }
+        if (generatedAreas == null) {
+            generatedAreas = new ArrayList();
+        }
+        generatedAreas.add(areaNode);
+    }
+
+    public void unregisterGeneratedArea(AreaNode areaNode) {
+        generatedAreas.remove(areaNode);
+    }
+
+    public AreaNode getFirstGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        return (AreaNode) generatedAreas.get(0);
+    }
+
+    public AreaNode getPreviousGeneratedBy(AreaNode area) {
+        if (generatedAreas == null) {
+            return null;
+        }
+        int index = generatedAreas.indexOf(area);
+        if (index > 0) {
+            return (AreaNode) generatedAreas.get(index - 1);
+        }
+        return null;
+    }
+
+    public AreaNode getNextGeneratedBy(AreaNode area) {
+        if (generatedAreas == null) {
+            return null;
+        }
+        int index = generatedAreas.indexOf(area);
+        if (index > 0 && index < generatedAreas.size() - 1) {
+            return (AreaNode) generatedAreas.get(index + 1);
+        }
+        return null;
+    }
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isFirstGeneratedBy(AreaNode area) {
+        if (generatedAreas.indexOf(area) == 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param area An Area instance.
+     * @return True iff area is the first Area generated by this.
+     */
+    public boolean isLastGeneratedBy(AreaNode area) {
+        if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return The current count of areas that have been generated by the FObj.
+     */
+    public int qtyAreasGenerated() {
+        return this.generatedAreas.size();
+    }
+
+    /**
+     * @return The last AreaNode generated by the parent FObj.
+     */
+    public AreaNode getLastGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        return (AreaNode) generatedAreas.get(generatedAreas.size() - 1);
+    }
+
+    /**
+     * @return The last Area generated by the parent FObj.
+     */
+    public Area getLastAreaGeneratedBy() {
+        if (generatedAreas == null || generatedAreas.size() < 1) {
+            return null;
+        }
+        for (int i = generatedAreas.size() - 1; i >= 0; i--) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+    public Area firstNormalAreaReturned() {
+        /*
+         * TODO: This is not right, but will do for now. It is not considering
+         * areas that are returned by the FO but not generated by it.
+         */
+        if (generatedAreas == null) {
+            return null;
+        }
+        for (int i = 0; i < generatedAreas.size(); i ++) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+    public Area lastNormalAreaReturned() {
+        /*
+         * TODO: This is not right, but will do for now. It is not considering
+         * areas that are returned by the FO but not generated by it.
+         */
+        if (generatedAreas == null) {
+            return null;
+        }
+        for (int i = generatedAreas.size() - 1; i >= 0; i --) {
+            Object object = generatedAreas.get(i);
+            if (object instanceof Area) {
+                return (Area) object;
+            }
+        }
+        return null;
+    }
+
+}

Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-12 14:56:38 UTC (rev 7530)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-12 15:05:56 UTC (rev 7531)
@@ -1,198 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/* $Id$ */
-
-package org.foray.area;
-
-import org.axsl.areaW.Area;
-import org.axsl.areaW.AreaNode;
-import org.axsl.foR.FONode;
-import org.axsl.foR.FONodeResult;
-
-import java.util.ArrayList;
-
-/**
- * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
- * with the FOray AreaTree.</p>
- */
-public class FOrayFOLinkage implements FONodeResult {
-
-    /** The FONode which generated the Areas in {@link #generatedAreas}. */
-    private FONode realFONode;
-
-    /**
-     * The ordered list of Area instances generated by {@link #realFONode}.
-     * Index 0 "is-first" and Index size() - 1 "is-last".
-     * This is currently set up to only store the root node of any subtree that
-     * was generated by {@link #realFONode}.
-     */
-    private ArrayList generatedAreas = new ArrayList();
-
-    public FOrayFOLinkage(FONode realFObj) {
-        this.realFONode = realFObj;
-    }
-
-    public FONode getFONode() {
-        return this.realFONode;
-    }
-
-    public void registerGeneratedArea(AreaNode areaNode) {
-        AreaNode parent = areaNode.getWritableParent();
-        if (parent != null) {
-            /*
-             * If the parent was generated by the same FObj, then we shouldn't
-             * register this one also.
-             */
-            if (areaNode.traitGeneratedBy() == parent.traitGeneratedBy()) {
-                return;
-            }
-        }
-        if (generatedAreas == null) {
-            generatedAreas = new ArrayList();
-        }
-        generatedAreas.add(areaNode);
-    }
-
-    public void unregisterGeneratedArea(AreaNode areaNode) {
-        generatedAreas.remove(areaNode);
-    }
-
-    public AreaNode getFirstGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        return (AreaNode) generatedAreas.get(0);
-    }
-
-    public AreaNode getPreviousGeneratedBy(AreaNode area) {
-        if (generatedAreas == null) {
-            return null;
-        }
-        int index = generatedAreas.indexOf(area);
-        if (index > 0) {
-            return (AreaNode) generatedAreas.get(index - 1);
-        }
-        return null;
-    }
-
-    public AreaNode getNextGeneratedBy(AreaNode area) {
-        if (generatedAreas == null) {
-            return null;
-        }
-        int index = generatedAreas.indexOf(area);
-        if (index > 0 && index < generatedAreas.size() - 1) {
-            return (AreaNode) generatedAreas.get(index + 1);
-        }
-        return null;
-    }
-
-    /**
-     * @param area An Area instance.
-     * @return True iff area is the first Area generated by this.
-     */
-    public boolean isFirstGeneratedBy(AreaNode area) {
-        if (generatedAreas.indexOf(area) == 0) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param area An Area instance.
-     * @return True iff area is the first Area generated by this.
-     */
-    public boolean isLastGeneratedBy(AreaNode area) {
-        if (generatedAreas.indexOf(area) == (generatedAreas.size() - 1)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return The current count of areas that have been generated by the FObj.
-     */
-    public int qtyAreasGenerated() {
-        return this.generatedAreas.size();
-    }
-
-    /**
-     * @return The last AreaNode generated by the parent FObj.
-     */
-    public AreaNode getLastGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        return (AreaNode) generatedAreas.get(generatedAreas.size() - 1);
-    }
-
-    /**
-     * @return The last Area generated by the parent FObj.
-     */
-    public Area getLastAreaGeneratedBy() {
-        if (generatedAreas == null || generatedAreas.size() < 1) {
-            return null;
-        }
-        for (int i = generatedAreas.size() - 1; i >= 0; i--) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-    public Area firstNormalAreaReturned() {
-        /*
-         * TODO: This is not right, but will do for now. It is not considering
-         * areas that are returned by the FO but not generated by it.
-         */
-        if (generatedAreas == null) {
-            return null;
-        }
-        for (int i = 0; i < generatedAreas.size(); i ++) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-    public Area lastNormalAreaReturned() {
-        /*
-         * TODO: This is not right, but will do for now. It is not considering
-         * areas that are returned by the FO but not generated by it.
-         */
-        if (generatedAreas == null) {
-            return null;
-        }
-        for (int i = generatedAreas.size() - 1; i >= 0; i --) {
-            Object object = generatedAreas.get(i);
-            if (object instanceof Area) {
-                return (Area) object;
-            }
-        }
-        return null;
-    }
-
-}

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 14:56:38 UTC (rev 7530)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 15:05:56 UTC (rev 7531)
@@ -531,7 +531,7 @@
      */
     private boolean startsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOrayFOLinkage proxy = linkage(parent);
+        FOLinkage proxy = linkage(parent);
         Area firstArea = (Area) proxy.firstNormalAreaReturned();
         if (firstArea == null) {
             return false;
@@ -548,7 +548,7 @@
      */
     private boolean endsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOrayFOLinkage proxy = linkage(parent);
+        FOLinkage proxy = linkage(parent);
         Area lastArea = (Area) proxy.lastNormalAreaReturned();
         if (lastArea == null) {
             return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7530] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7530
Author:   victormote
Date:     2006-06-12 07:56:38 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7530&view=rev

Log Message:
-----------
Rename method and local variable for clarity.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:52:02 UTC (rev 7529)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:56:38 UTC (rev 7530)
@@ -65,7 +65,7 @@
             // AreaTree has no parent with which to register
             getAreaNodeParent().getChildren().add(this);
             // Root can't do this because the AreaTreeControl isn't registered.
-            this.generatedBy = getFObjProxy(generatedBy);
+            this.generatedBy = linkage(generatedBy);
             this.generatedBy.registerGeneratedArea(this);
         }
     }
@@ -92,14 +92,14 @@
         this.children.remove(areaNode);
     }
 
-    protected FOrayFOLinkage getFObjProxy(FONode fobj) {
-        if (fobj == null) {
+    protected FOrayFOLinkage linkage(FONode foNode) {
+        if (foNode == null) {
             return null;
         }
-        FOrayFOLinkage linkage = (FOrayFOLinkage) fobj.getResult();
+        FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult();
         if (linkage == null) {
-            linkage = new FOrayFOLinkage(fobj);
-            fobj.setResult(linkage);
+            linkage = new FOrayFOLinkage(foNode);
+            foNode.setResult(linkage);
         }
         return linkage;
     }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 14:52:02 UTC (rev 7529)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-12 14:56:38 UTC (rev 7530)
@@ -80,7 +80,7 @@
          * These registration steps must take place after the AreaTreeControl
          * has been stored.
          */
-        this.generatedBy = getFObjProxy(root);
+        this.generatedBy = linkage(root);
         this.generatedBy.registerGeneratedArea(this);
     }
 
@@ -178,7 +178,7 @@
      */
     public Area firstNormalAreaReturned(String id) {
         FObj fobj = retrieveId(id);
-        FOrayFOLinkage proxy = getFObjProxy(fobj);
+        FOrayFOLinkage proxy = linkage(fobj);
         return proxy.firstNormalAreaReturned();
     }
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-12 14:52:02 UTC (rev 7529)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-06-12 14:56:38 UTC (rev 7530)
@@ -332,7 +332,7 @@
     public org.axsl.areaW.SpanRA startingReferenceArea(FObj lastFObj,
             FObj nextFObj) throws AreaWException {
         if (lastFObj != null) {
-            Area lastArea = (Area) getFObjProxy(lastFObj)
+            Area lastArea = (Area) linkage(lastFObj)
                     .getLastAreaGeneratedBy();
             SpanRA lastSpan = lastArea.ancestorSpanRA();
             return lastSpan.spanForNextFO(nextFObj);

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 14:52:02 UTC (rev 7529)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-12 14:56:38 UTC (rev 7530)
@@ -531,7 +531,7 @@
      */
     private boolean startsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOrayFOLinkage proxy = getFObjProxy(parent);
+        FOrayFOLinkage proxy = linkage(parent);
         Area firstArea = (Area) proxy.firstNormalAreaReturned();
         if (firstArea == null) {
             return false;
@@ -548,7 +548,7 @@
      */
     private boolean endsHere(Marker marker)  {
         FObj parent = marker.parentFO();
-        FOrayFOLinkage proxy = getFObjProxy(parent);
+        FOrayFOLinkage proxy = linkage(parent);
         Area lastArea = (Area) proxy.lastNormalAreaReturned();
         if (lastArea == null) {
             return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7529] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7529
Author:   victormote
Date:     2006-06-12 07:52:02 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7529&view=rev

Log Message:
-----------
Conform to axsl change: Remove no-longer-needed interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:48:38 UTC (rev 7528)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:52:02 UTC (rev 7529)
@@ -26,7 +26,6 @@
 
 import org.foray.common.OrderedTreeNode;
 
-import org.axsl.areaW.FOLinkage;
 import org.axsl.areaW.PageArea;
 import org.axsl.common.Constants;
 import org.axsl.foR.FOContext;
@@ -410,15 +409,6 @@
         return true;
     }
 
-    public FOLinkage getFOLinkage(FObj foNode) {
-        FOrayFOLinkage linkage = (FOrayFOLinkage) foNode.getResult();
-        if (linkage == null) {
-            linkage = new FOrayFOLinkage(foNode);
-            foNode.setResult(linkage);
-        }
-        return linkage;
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-12 14:48:38 UTC (rev 7528)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayFOLinkage.java	2006-06-12 14:52:02 UTC (rev 7529)
@@ -26,8 +26,8 @@
 
 import org.axsl.areaW.Area;
 import org.axsl.areaW.AreaNode;
-import org.axsl.areaW.FOLinkage;
 import org.axsl.foR.FONode;
+import org.axsl.foR.FONodeResult;
 
 import java.util.ArrayList;
 
@@ -35,7 +35,7 @@
  * <p>An implementation of {@link org.axsl.foR.FONodeProxy} suitable for use
  * with the FOray AreaTree.</p>
  */
-public class FOrayFOLinkage implements FOLinkage {
+public class FOrayFOLinkage implements FONodeResult {
 
     /** The FONode which generated the Areas in {@link #generatedAreas}. */
     private FONode realFONode;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7528] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java

[<vic...@us...>]

Revision: 7528
Author:   victormote
Date:     2006-06-12 07:48:38 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7528&view=rev

Log Message:
-----------
Remove no-longer-needed method.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-12 14:45:40 UTC (rev 7527)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-12 14:48:38 UTC (rev 7528)
@@ -26,7 +26,6 @@
 
 import org.axsl.areaW.Area;
 import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.FOLinkage;
 import org.axsl.areaW.LineArea;
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.TableCellArea;
@@ -259,16 +258,4 @@
         return this.realFONode;
     }
 
-    public FOLinkage getFOLinkage() {
-        FONode foNode = this.getFONode();
-        if (foNode == null) {
-            return null;
-        }
-        FOLinkage linkage = (FOLinkage) foNode.getResult();
-        if (linkage == null) {
-            return null;
-        }
-        return linkage;
-    }
-
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7527] trunk/foray/foray-pioneer

[<vic...@us...>]

Revision: 7527
Author:   victormote
Date:     2006-06-12 07:45:40 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7527&view=rev

Log Message:
-----------
Use new axsl method to remove dependency on FOLinkage interface.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/.classpath
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
Modified: trunk/foray/foray-pioneer/.classpath
===================================================================
--- trunk/foray/foray-pioneer/.classpath	2006-06-12 14:36:17 UTC (rev 7526)
+++ trunk/foray/foray-pioneer/.classpath	2006-06-12 14:45:40 UTC (rev 7527)
@@ -5,7 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/axslFont-R"/>
 	<classpathentry kind="src" path="/axslGraphic-R"/>
-	<classpathentry kind="src" path="/axslArea-R"/>
 	<classpathentry kind="src" path="/axslArea-W"/>
 	<classpathentry kind="src" path="/axslFO-R"/>
 	<classpathentry kind="src" path="/axslCommon"/>

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java	2006-06-12 14:36:17 UTC (rev 7526)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ContinuedLabelPL.java	2006-06-12 14:45:40 UTC (rev 7527)
@@ -25,12 +25,10 @@
 package org.foray.pioneer;
 
 import org.axsl.areaW.Area;
-
 import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.FOLinkage;
+import org.axsl.areaW.TableArea;
 import org.axsl.foR.FONode;
 import org.axsl.foR.extension.ContinuedLabel;
-import org.axsl.foR.fo.Table;
 
 /**
  *
@@ -60,9 +58,8 @@
         }
 
         // See if ancestor table has generated any areas yet.
-        Table table = label.getNearestTable(area);
-        FOLinkage linkage = (FOLinkage) table.getResult();
-        if (linkage != null && linkage.qtyAreasGenerated() > 0) {
+        TableArea tableArea = area.ancestorTableArea();
+        if (tableArea != null && tableArea.getPreviousSibling() != null) {
             int numChildren = label.getChildren().size();
             for (int i = getProgress(); i < numChildren; i++) {
                 FONode fo = (FONode)label.getChildren().get(i);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7526] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7526
Author:   victormote
Date:     2006-06-12 07:36:17 -0700 (Mon, 12 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7526&view=rev

Log Message:
-----------
Conform to axsl change: Add method to get ancestor Table Area.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-11 18:57:54 UTC (rev 7525)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-12 14:36:17 UTC (rev 7526)
@@ -347,14 +347,25 @@
         return ancestorLineArea();
     }
 
-    public TableRA ancestorTableArea() {
+    /**
+     * The same as {@link #ancestorTableArea()}, except cast as the
+     * implementation instead of the interface (for internal AreaTree use).
+     */
+    public TableRA ancestorTableRA() {
         AreaNode parent = getAreaNodeParent();
         if (parent == null) {
             return null;
         }
-        return parent.ancestorTableArea();
+        return parent.ancestorTableRA();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public org.axsl.areaW.TableArea ancestorTableArea() {
+        return ancestorTableRA();
+    }
+
     public PageCollection ancestorPageCollection() {
         AreaNode parent = getAreaNodeParent();
         if (parent == null) {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-11 18:57:54 UTC (rev 7525)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2006-06-12 14:36:17 UTC (rev 7526)
@@ -141,7 +141,7 @@
      * columns.
      */
     public int getProgressionDimension() {
-        TableRA tableRA = this.ancestorTableArea();
+        TableRA tableRA = this.ancestorTableRA();
         int startingColumn = this.tableCellGeneratedBy().traitColumnNumber(
                 this);
         int span = this.tableCellGeneratedBy().traitNumberColumnsSpanned();

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-11 18:57:54 UTC (rev 7525)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-12 14:36:17 UTC (rev 7526)
@@ -75,7 +75,7 @@
     /**
      * Overrides the AreaNode method, because this is the TableRA being sought.
      */
-    public TableRA ancestorTableArea() {
+    public TableRA ancestorTableRA() {
         return this;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7525] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java

[<vic...@us...>]

Revision: 7525
Author:   victormote
Date:     2006-06-11 11:57:54 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7525&view=rev

Log Message:
-----------
Conform to axsl change: Add new HyphenBreak interface and method in Hyphenation to return one for a specific hyphen break.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-11 15:42:48 UTC (rev 7524)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-11 18:57:54 UTC (rev 7525)
@@ -29,6 +29,7 @@
  
 package org.foray.hyphenR;
 
+import org.axsl.hyphenR.HyphenBreak;
 import org.axsl.hyphenR.HyphenationException;
 
 /**
@@ -120,4 +121,12 @@
         return liangValue;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public HyphenBreak getHyphenBreak(int index) {
+        /* TODO: Consider implementing this. */
+        return null;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7524] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java

[<vic...@us...>]

Revision: 7524
Author:   victormote
Date:     2006-06-11 08:42:48 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7524&view=rev

Log Message:
-----------
Add to-do items for 32-bit input errors.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-11 15:33:42 UTC (rev 7523)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-11 15:42:48 UTC (rev 7524)
@@ -289,6 +289,9 @@
         /* TODO: After Java 5 is the minimum, use the standard String
          * constructor instead. */
         String string = StringUtilPre5.newString(word, offset, len);
+        /* FIXME: The Hyphenation instance needs to know that it was created
+         * from an int[] instead of a char[], so that it can properly handle
+         * surrogate pairs (an int that would convert to 2 chars).*/
         return this.hyphenate(string, offset, len,
                 language, country, remainCount, pushCount, includeInhibitors);
     }
@@ -346,6 +349,8 @@
          * constructor instead. */
         String string = StringUtilPre5.newString(characters, wordStart,
                 (characters.length - wordStart));
+        /* FIXME: Return value needs to be reduced by the number of surrogate
+         * pairs (an int that would convert to 2 chars) found.*/
         return wordSize(string, wordStart, language, country);
     }
 
@@ -396,6 +401,8 @@
          * constructor instead. */
         String string = StringUtilPre5.newString(characters, startIndex,
                 (characters.length - startIndex));
+        /* FIXME: Return value needs to be reduced by the number of surrogate
+         * pairs (an int that would convert to 2 chars) found.*/
         return wordStarts(string, startIndex, language, country);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7523] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java

[<vic...@us...>]

Revision: 7523
Author:   victormote
Date:     2006-06-11 08:33:42 -0700 (Sun, 11 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7523&view=rev

Log Message:
-----------
Let the Liang conversion method take any positive input.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-10 22:38:30 UTC (rev 7522)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-11 15:33:42 UTC (rev 7523)
@@ -29,6 +29,8 @@
  
 package org.foray.hyphenR;
 
+import org.axsl.hyphenR.HyphenationException;
+
 /**
  * This class represents a hyphenated word.
  */
@@ -71,7 +73,12 @@
         byte[] returnArray = new byte[this.hyphenValues.length];
         for (int i = 0; i < this.hyphenValues.length; i++) {
             byte value = this.hyphenValues[i];
-            returnArray[i] = convertLiangToWeight(value);
+            try {
+                returnArray[i] = convertLiangToWeight(value);
+            } catch (HyphenationException e) {
+                /* TODO: This exception should be passed upstream further. */
+                returnArray[i] = Byte.MIN_VALUE;
+            }
         }
         return returnArray;
     }
@@ -92,21 +99,25 @@
      * In the Liang system, 1) even values are negative, 2) odd values are
      * positive, and the magnitude of the number conveys the magnitude of
      * the direction.
-     * @param liangValue A value in the range 0-5 that contains the Liang
-     * algorithm weight.
-     * @return A value in the range -2 to +3 that reflects the numeric weight
-     * of the raw Liang value.
+     * @param liangValue Any positive byte value that contains a Liang-style
+     * algorithm weight. (Liang input is only in the range 0 to 5, but we will
+     * handle any positive input).
+     * @return A value that reflects the numeric weight of the raw Liang value.
      */
-    public static byte convertLiangToWeight(int liangValue) {
-        switch (liangValue) {
-        case 0: return 0;
-        case 1: return 1;
-        case 2: return -1;
-        case 3: return 2;
-        case 4: return -2;
-        case 5: return 3;
-        default: return Byte.MIN_VALUE;
+    public static byte convertLiangToWeight(byte liangValue)
+            throws HyphenationException {
+        if (liangValue < 0) {
+            throw new HyphenationException("Invalid Liang input: "
+                    + liangValue);
         }
+        /* Save the low-order bit. */
+        boolean good = (liangValue & 1) == 1;
+        liangValue ++;
+        liangValue /= 2;
+        if (! good) {
+            liangValue *= -1;
+        }
+        return liangValue;
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7522] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR

[<vic...@us...>]

Revision: 7522
Author:   victormote
Date:     2006-06-10 15:38:30 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7522&view=rev

Log Message:
-----------
Conform to axsl change: Add method that returns the Liang input scheme weights, for backward compatibility.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-10 21:45:40 UTC (rev 7521)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-10 22:38:30 UTC (rev 7522)
@@ -38,6 +38,7 @@
 
     private int[] hyphenPoints;
 
+    /* Always store the weights using the Liang weights. */
     private byte[] hyphenValues;
 
     Hyphenation(String word, int[] points, byte[] values) {
@@ -56,10 +57,25 @@
     /**
      * {@inheritDoc}
      */
-    public byte[] getWeights() {
+    public byte[] getLiangWeights() {
         return this.hyphenValues;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public byte[] getWeights() {
+        if (this.hyphenValues == null) {
+            return null;
+        }
+        byte[] returnArray = new byte[this.hyphenValues.length];
+        for (int i = 0; i < this.hyphenValues.length; i++) {
+            byte value = this.hyphenValues[i];
+            returnArray[i] = convertLiangToWeight(value);
+        }
+        return returnArray;
+    }
+
     public String toString() {
         StringBuffer str = new StringBuffer();
         int start = 0;
@@ -71,4 +87,26 @@
         return str.toString();
     }
 
+    /**
+     * Converts the raw value from the Liang data to a weighted value.
+     * In the Liang system, 1) even values are negative, 2) odd values are
+     * positive, and the magnitude of the number conveys the magnitude of
+     * the direction.
+     * @param liangValue A value in the range 0-5 that contains the Liang
+     * algorithm weight.
+     * @return A value in the range -2 to +3 that reflects the numeric weight
+     * of the raw Liang value.
+     */
+    public static byte convertLiangToWeight(int liangValue) {
+        switch (liangValue) {
+        case 0: return 0;
+        case 1: return 1;
+        case 2: return -1;
+        case 3: return 2;
+        case 4: return -2;
+        case 5: return 3;
+        default: return Byte.MIN_VALUE;
+        }
+    }
+
 }

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-06-10 21:45:40 UTC (rev 7521)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-06-10 22:38:30 UTC (rev 7522)
@@ -304,32 +304,6 @@
     }
 
     /**
-     * Converts the raw value from the Liang data to a weighted value.
-     * In the Liang system, 1) even values are negative, 2) odd values are
-     * positive, and the magnitude of the number conveys the magnitude of
-     * the direction.
-     * @param liangValue A value in the range 0-9 that contains the Liang
-     * algorithm weight.
-     * @return A value in the range -4 to +5 that reflects the numeric weight
-     * of the raw Liang value.
-     */
-    public static byte convertLiangToWeight(int liangValue) {
-        switch (liangValue) {
-        case 0: return 0;
-        case 1: return 1;
-        case 2: return -1;
-        case 3: return 2;
-        case 4: return -2;
-        case 5: return 3;
-        case 6: return -3;
-        case 7: return 4;
-        case 8: return -4;
-        case 9: return 5;
-        default: return 0;
-        }
-    }
-
-    /**
      * @param points
      * @param k
      * @return The new Hyphenation instance.
@@ -408,20 +382,19 @@
         }
 
         for (int i = 0; i < len; i++) {
-            int interletterValue = il[i + 1];
+            byte interletterValue = il[i + 1];
             boolean reportValue = reportValue(interletterValue, i, len,
                     remainCharCount, pushCharCount, includeInhibitors);
             if (reportValue) {
                 k++;
                 result[k] = i;
-                byte weight = convertLiangToWeight(interletterValue);
-                values[k] = weight;
+                values[k] = interletterValue;
             }
         }
         return createHyphenation(theWord, result, values, k);
     }
 
-    private boolean reportValue(int interletterValue, int index, int length,
+    private boolean reportValue(byte interletterValue, int index, int length,
             int remainCharCount, int pushCharCount, boolean includeInhibitors) {
         /* Zeroes are never reported. */
         if (interletterValue == 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7521] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java

[<vic...@us...>]

Revision: 7521
Author:   victormote
Date:     2006-06-10 14:45:40 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7521&view=rev

Log Message:
-----------
Conform to axsl change: Add overloaded versions of all methods to take int[] input.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-10 21:24:35 UTC (rev 7520)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-10 21:45:40 UTC (rev 7521)
@@ -282,6 +282,17 @@
                 includeInhibitors);
     }
 
+    public org.axsl.hyphenR.Hyphenation hyphenate(int[] word, int offset,
+            int len, String language, String country, int remainCount,
+            int pushCount, boolean includeInhibitors) {
+        /* Convert to a String using the 32-bit ICU4J method. */
+        /* TODO: After Java 5 is the minimum, use the standard String
+         * constructor instead. */
+        String string = StringUtilPre5.newString(word, offset, len);
+        return this.hyphenate(string, offset, len,
+                language, country, remainCount, pushCount, includeInhibitors);
+    }
+
     public Log getLogger() {
         return this.logger;
     }
@@ -325,6 +336,22 @@
     /**
      * {@inheritDoc}
      */
+    public int wordSize(int[] characters, int wordStart, String language,
+            String country) {
+        if (characters == null) {
+            return 0;
+        }
+        /* Convert to a String using the 32-bit ICU4J method. */
+        /* TODO: After Java 5 is the minimum, use the standard String
+         * constructor instead. */
+        String string = StringUtilPre5.newString(characters, wordStart,
+                (characters.length - wordStart));
+        return wordSize(string, wordStart, language, country);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public int wordStarts(char[] characters, int startIndex, String language,
             String country) {
         if (characters == null) {
@@ -359,4 +386,17 @@
                 language, country);
     }
 
+    public int wordStarts(int[] characters, int startIndex,
+            String language, String country) {
+        if (characters == null) {
+            return -1;
+        }
+        /* Convert to a String using the 32-bit ICU4J method. */
+        /* TODO: After Java 5 is the minimum, use the standard String
+         * constructor instead. */
+        String string = StringUtilPre5.newString(characters, startIndex,
+                (characters.length - startIndex));
+        return wordStarts(string, startIndex, language, country);
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7520] trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR

[<vic...@us...>]

Revision: 7520
Author:   victormote
Date:     2006-06-10 14:24:35 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7520&view=rev

Log Message:
-----------
Conform to axsl changes:
1. Rename Hyphenation methods for brevity.
2. Add boolean to hyphenation that allows the client to either include or exclude the inhibitors.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-10 21:24:28 UTC (rev 7519)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java	2006-06-10 21:24:35 UTC (rev 7520)
@@ -49,14 +49,14 @@
     /**
      * {@inheritDoc}
      */
-    public int[] getHyphenationPoints() {
+    public int[] getPoints() {
         return this.hyphenPoints;
     }
 
     /**
      * {@inheritDoc}
      */
-    public byte[] getHyphenationWeights() {
+    public byte[] getWeights() {
         return this.hyphenValues;
     }
 

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-10 21:24:28 UTC (rev 7519)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-06-10 21:24:35 UTC (rev 7520)
@@ -266,19 +266,20 @@
 
     public org.axsl.hyphenR.Hyphenation hyphenate(CharSequence word, int offset,
             int len, String language, String country, int remainCount,
-            int pushCount) {
+            int pushCount, boolean includeInhibitors) {
         return this.hyphenate(word.toString().toCharArray(), offset, len,
-                language, country, remainCount, pushCount);
+                language, country, remainCount, pushCount, includeInhibitors);
     }
 
     public org.axsl.hyphenR.Hyphenation hyphenate(char[] word, int offset,
             int len, String language, String country, int remainCount,
-            int pushCount) {
+            int pushCount, boolean includeInhibitors) {
         HyphenationTree hTree = getHyphenationTree(language, country);
         if (hTree == null) {
             return null;
         }
-        return hTree.hyphenate(word, offset, len, remainCount, pushCount);
+        return hTree.hyphenate(word, offset, len, remainCount, pushCount,
+                includeInhibitors);
     }
 
     public Log getLogger() {

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-06-10 21:24:28 UTC (rev 7519)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-06-10 21:24:35 UTC (rev 7520)
@@ -286,7 +286,7 @@
      * the hyphenated word or null if word is not hyphenated.
      */
     public org.axsl.hyphenR.Hyphenation hyphenate(char[] w, int offset, int len,
-            int remainCharCount, int pushCharCount) {
+            int remainCharCount, int pushCharCount, boolean includeInhibitors) {
         char[] word = normalizeWord(w, offset, len);
         if (word == null) {
             return null;
@@ -299,7 +299,7 @@
             return hyphenation;
         }
         hyphenation = checkAlgorithm(theWord, remainCharCount, pushCharCount,
-                word);
+                word, includeInhibitors);
         return hyphenation;
     }
 
@@ -330,19 +330,19 @@
     }
 
     /**
-     * @param result
+     * @param points
      * @param k
      * @return The new Hyphenation instance.
      */
-    private Hyphenation createHyphenation(String theWord, int[] result,
+    private Hyphenation createHyphenation(String theWord, int[] points,
             byte[] values, int k) {
         if (k > 0) {
             // trim result array
-            int[] res = new int[k];
-            System.arraycopy(result, 0, res, 0, k);
-            /* TODO: values needs to be populated. Also both positive and
-             * negative values should be returned. */
-            return new Hyphenation(theWord, res, values);
+            int[] returnPoints = new int[k];
+            System.arraycopy(points, 0, returnPoints, 0, k);
+            byte[] returnValues = new byte[k];
+            System.arraycopy(values, 0, returnValues, 0, k);
+            return new Hyphenation(theWord, returnPoints, returnValues);
         }
         return null;
     }
@@ -393,7 +393,7 @@
     }
 
     private Hyphenation checkAlgorithm(String theWord, int remainCharCount,
-            int pushCharCount, char[] word) {
+            int pushCharCount, char[] word, boolean includeInhibitors) {
         int len = theWord.length();
         // use algorithm to get hyphenation points
         int[] result = new int[len + 1];
@@ -407,12 +407,11 @@
             searchPatterns(word, i, il);
         }
 
-        /* We report all of the non-zero values. */
         for (int i = 0; i < len; i++) {
             int interletterValue = il[i + 1];
-            if (interletterValue != 0
-                    && i >= remainCharCount
-                    && i <= (len - pushCharCount)) {
+            boolean reportValue = reportValue(interletterValue, i, len,
+                    remainCharCount, pushCharCount, includeInhibitors);
+            if (reportValue) {
                 k++;
                 result[k] = i;
                 byte weight = convertLiangToWeight(interletterValue);
@@ -422,6 +421,29 @@
         return createHyphenation(theWord, result, values, k);
     }
 
+    private boolean reportValue(int interletterValue, int index, int length,
+            int remainCharCount, int pushCharCount, boolean includeInhibitors) {
+        /* Zeroes are never reported. */
+        if (interletterValue == 0) {
+            return false;
+        }
+        if (index < remainCharCount) {
+            return false;
+        }
+        if (index > (length - pushCharCount)) {
+            return false;
+        }
+        if (includeInhibitors) {
+            return true;
+        }
+        /* If the value is odd, then it is not an inhibitor. */
+        if ((interletterValue & 1) == 1) {
+            return true;
+        }
+        /* The value is an inhibitor and should not be included. */
+        return false;
+    }
+
     /**
      * Add a character class to the tree. It is used by
      * {@link PatternParser PatternParser} as callback to
@@ -554,7 +576,7 @@
                 token = in.readLine().trim();
                 logger.info("Hyphenation points: ");
                 logger.info(ht.hyphenate(token.toCharArray(), 0, token.length(),
-                        minCharCount, minCharCount).toString());
+                        minCharCount, minCharCount, true).toString());
             } else if (token.equals("b")) {
                 if (ht == null) {
                     logger.info("No patterns has been loaded.");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7519] trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java

[<vic...@us...>]

Revision: 7519
Author:   victormote
Date:     2006-06-10 14:24:28 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7519&view=rev

Log Message:
-----------
Conform to axsl changes:
1. Rename Hyphenation methods for brevity.
2. Add boolean to hyphenation that allows the client to either include or exclude the inhibitors.

Modified Paths:
--------------
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-10 17:56:59 UTC (rev 7518)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-06-10 21:24:28 UTC (rev 7519)
@@ -369,7 +369,7 @@
         Hyphenation hyph = server.hyphenate(wordToHyphenate, 0,
                 wordToHyphenate.length(), language, country,
                 this.currentLineText.inlineHyphenationRemainCount(),
-                this.currentLineText.inlineHyphenationPushCount());
+                this.currentLineText.inlineHyphenationPushCount(), false);
         // If none, the word cannot be hyphenated.
         if (hyph == null) {
             return this.wordStart;
@@ -382,7 +382,7 @@
             return wordStart;
         }
         // Compute the number of characters that should be included.
-        int charsToInclude = hyph.getHyphenationPoints()[index];
+        int charsToInclude = hyph.getPoints()[index];
         // Add it and the non-word characters to the count to be returned.
         return wordStart + nonWordChars + charsToInclude;
     }
@@ -395,8 +395,8 @@
         int remainingWidth = this.currentLineWidthRemaining() - finalWidth
                 - spaceWidth - getHyphenWidth(this.currentLineText);
 
-        int[] hyphenationPoints = hyph.getHyphenationPoints();
-        byte[] hyphenationWeights = hyph.getHyphenationWeights();
+        int[] hyphenationPoints = hyph.getPoints();
+        byte[] hyphenationWeights = hyph.getWeights();
 
         int index = -1;
         String wordBegin = "";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7518] trunk/foray/foray-pioneer/src/java/org/foray/pioneer

[<vic...@us...>]

Revision: 7518
Author:   victormote
Date:     2006-06-10 10:56:59 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7518&view=rev

Log Message:
-----------
Remove unnecessary casts.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-10 17:56:51 UTC (rev 7517)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-06-10 17:56:59 UTC (rev 7518)
@@ -215,7 +215,7 @@
         // It did not fit on the line. Create new line & try again.
         NormalBlockArea blockArea
                 = (NormalBlockArea) lineArea.getWritableParentArea();
-        lineArea = (LineArea) blockArea.createNextLineArea(false);
+        lineArea = blockArea.createNextLineArea(false);
         BlockPL blockPL = this.layout.getBlockPL(blockArea);
         blockPL.currentLineArea = lineArea;
         

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java	2006-06-10 17:56:51 UTC (rev 7517)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java	2006-06-10 17:56:59 UTC (rev 7518)
@@ -49,7 +49,7 @@
             FObj nextFObj = (FObj) children.get(i);
             org.axsl.areaW.SpanRA span = pc.startingReferenceArea(lastFObj,
                     nextFObj);
-            NormalFlowRA nf = (NormalFlowRA) span.normalFlowForNextFO(nextFObj);
+            NormalFlowRA nf = span.normalFlowForNextFO(nextFObj);
             this.getLayoutProxy(nextFObj).layout(nf);
         }
         return 0;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-10 17:56:51 UTC (rev 7517)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-10 17:56:59 UTC (rev 7518)
@@ -172,9 +172,8 @@
                    isBlankPage = true;
                 }
             }
-            /* TODO: Remove cast from following line. */
-            PageArea newPage = (PageArea) pageCollection.getNextPage(false,
-                    false, isBlankPage);
+            PageArea newPage = pageCollection.getNextPage(false, false,
+                    isBlankPage);
             setPendingFootnotes(newPage);
             currentPage = newPage;
             /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7517] trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java

[<vic...@us...>]

Revision: 7517
Author:   victormote
Date:     2006-06-10 10:56:51 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7517&view=rev

Log Message:
-----------
Remove unnecessary casts.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java	2006-06-10 17:56:43 UTC (rev 7516)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java	2006-06-10 17:56:51 UTC (rev 7517)
@@ -178,7 +178,7 @@
         if (index < 0 || index > this.columns.length - 1) {
             return null;
         }
-        return (TableColumn) this.columns[index];
+        return this.columns[index];
     }
 
     public org.axsl.foR.fo.TableColumn[] getTableColumns() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7516] trunk/foray/foray-areatree/src/java/org/foray/area

[<vic...@us...>]

Revision: 7516
Author:   victormote
Date:     2006-06-10 10:56:43 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7516&view=rev

Log Message:
-----------
Remove unnecessary casts.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-10 17:39:45 UTC (rev 7515)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2006-06-10 17:56:43 UTC (rev 7516)
@@ -133,7 +133,7 @@
     }
 
     public org.axsl.areaW.Area getWritableParentArea() {
-        return (org.axsl.areaW.Area) getParentArea();
+        return getParentArea();
     }
 
     public Area getParentArea() {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-10 17:39:45 UTC (rev 7515)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-06-10 17:56:43 UTC (rev 7516)
@@ -179,7 +179,7 @@
     public Area firstNormalAreaReturned(String id) {
         FObj fobj = retrieveId(id);
         FOrayFOLinkage proxy = getFObjProxy(fobj);
-        return (Area) proxy.firstNormalAreaReturned();
+        return proxy.firstNormalAreaReturned();
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-10 17:39:45 UTC (rev 7515)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-06-10 17:56:43 UTC (rev 7516)
@@ -74,7 +74,7 @@
     }
 
     public org.axsl.areaW.PageCollection getWritablePageCollection() {
-        return (org.axsl.areaW.PageCollection) getAreaTreeParent();
+        return getAreaTreeParent();
     }
 
     private PageCollection getAreaTreeParent() {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-10 17:39:45 UTC (rev 7515)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2006-06-10 17:56:43 UTC (rev 7516)
@@ -139,7 +139,7 @@
          * units for each one.
          */
         for (int i = 0; i < node.getTableColumns().length; i++) {
-            TableColumn column = (TableColumn) node.getTableColumns()[i];
+            TableColumn column = node.getTableColumns()[i];
             if (column == null) {
                 getLogger().warn("No table-column specification for column " +
                          (i + 1) + ".");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7515] trunk/foray/foray-fotree/src/java/org/foray/fotree

[<vic...@us...>]

Revision: 7515
Author:   victormote
Date:     2006-06-10 10:39:45 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7515&view=rev

Log Message:
-----------
Conform to axsl change: Remove methods for setting a list of unsupported elements and attributes. Warnings about such items should come downstream, unless the limitations are internal to FOTree itself, in which case no interface items are required.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2006-06-10 17:32:41 UTC (rev 7514)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2006-06-10 17:39:45 UTC (rev 7515)
@@ -54,9 +54,6 @@
 public class FOTreeBuilder extends DefaultHandler
         implements org.axsl.foR.FOTree {
 
-    byte[] unsupportedObjectsFO;
-    short[] unsupportedPropertiesFO;
-
     /**
      * current formatting object being handled
      */
@@ -369,22 +366,6 @@
         return this.server;
     }
 
-    public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) {
-        this.unsupportedObjectsFO = unsupportedObjectsFO;
-    }
-
-    public byte[] getUnsupportedObjectsFO() {
-        return this.unsupportedObjectsFO;
-    }
-
-    public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) {
-        this.unsupportedPropertiesFO = unsupportedPropertiesFO;
-    }
-
-    public short[] getUnsupportedPropertiesFO() {
-        return this.unsupportedPropertiesFO;
-    }
-
     public void setGraphicServer(GraphicServer graphicServer) {
         this.graphicServer = graphicServer;
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java	2006-06-10 17:32:41 UTC (rev 7514)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java	2006-06-10 17:39:45 UTC (rev 7515)
@@ -68,8 +68,6 @@
                 list, locator);
         if (fobj == null) {
             checkUnknownElement(builder, localName, locator);
-        } else {
-            checkSupportedElement(builder, localName, locator);
         }
         return fobj;
     }
@@ -186,9 +184,6 @@
             throws PropertyException {
         Property property = parseAttributeForNS(attributes, attributeName,
                 attributeValue, propertyList, locator);
-        if (property != null) {
-            checkSupportedAttribute(builder, attributeName, locator);
-        }
         return property;
     }
 
@@ -251,36 +246,4 @@
      */
     public abstract String getPropertyName(short propertyType) ;
 
-    public void checkSupportedElement(FOTreeBuilder builder,
-            String localName, Locator locator) {
-        byte[] unsupportedObjects = builder.getUnsupportedObjectsFO();
-        if (unsupportedObjects == null) {
-            return;
-        }
-        byte enumerated = enumerateElement(localName);
-        for (int i = 0; i < unsupportedObjects.length; i++) {
-            if (enumerated == unsupportedObjects[i]) {
-                builder.getLogger().info("Unsupported element: "
-                        + getTypicalPrefix() + ":" + localName
-                        + " at " + formatLocator(locator) + ".");
-            }
-        }
-    }
-
-    public void checkSupportedAttribute(FOTreeBuilder builder, 
-            String attributeName, Locator locator) {
-        short[] unsupportedProperties = builder.getUnsupportedPropertiesFO();
-        if (unsupportedProperties == null) {
-            return;
-        }
-        short enumerated = enumerateAttribute(attributeName);
-        for (int i = 0; i < unsupportedProperties.length; i++) {
-            if (enumerated == unsupportedProperties[i]) {
-                builder.getLogger().info("Unsupported attribute: "
-                        + attributeName + " at "
-                        + formatLocator(locator) + ".");
-            }
-        }
-    }
-
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7514] trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java

[<vic...@us...>]

Revision: 7514
Author:   victormote
Date:     2006-06-10 10:32:41 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7514&view=rev

Log Message:
-----------
Remove unnecessarily restrictive method.

Modified Paths:
--------------
    trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2006-06-10 17:29:41 UTC (rev 7513)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java	2006-06-10 17:32:41 UTC (rev 7514)
@@ -31,7 +31,6 @@
 import org.axsl.areaW.PageCollection;
 import org.axsl.areaW.RegionArea;
 import org.axsl.foR.FONode;
-import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOText;
 import org.axsl.foR.fo.ExternalGraphic;
 import org.axsl.foR.fo.InstreamForeignObject;
@@ -97,14 +96,6 @@
     public abstract void layoutStaticContent(PageSequence pageSequence,
             Region region, RegionArea area) throws AreaWException;
 
-    /**
-     * LayoutStrategy implementations can override this method to create
-     * FObjProxy subclasses that are part of their layout system.
-     * @param node
-     * @return A new FObjProxy which proxies node.
-     */
-    public abstract FONodeProxy makeFObjProxy(FONode node) ;
-
     public void handleLineBreakText(LineOutput lineOutput, LineText text,
             int startOffset, int sizeInChars, int sizeInline,
             boolean hasDiscretionaryHyphen, boolean hasFauxSmallCaps,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7513] trunk/foray/foray-fotree/src/java/org/foray/fotree

[<vic...@us...>]

Revision: 7513
Author:   victormote
Date:     2006-06-10 10:29:41 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7513&view=rev

Log Message:
-----------


Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -93,11 +93,6 @@
     /**
      * {@inheritDoc}
      */
-    public abstract byte getNodeType() ;
-
-    /**
-     * {@inheritDoc}
-     */
     public void setProxy(FONodeProxy proxy) {
         this.proxy = proxy;
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -109,10 +109,6 @@
         return true;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TEXT;
-    }
-
     /**
      * <p>Filters the raw text as needed to present the text that should appear
      * in the "refined FO tree".

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -319,13 +319,6 @@
     /**
      * {@inheritDoc}
      */
-    public byte getNodeType() {
-        return FONode.NODE_FOBJ;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
     public void throwException(String message) throws FOTreeException {
         throwException(getContextMessage(), message);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -133,10 +133,6 @@
         return text.getAreaTreeText(context);
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_FOBJ_MIXED;
-    }
-
     public boolean canContainBlock() {
         return true;
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -99,10 +99,6 @@
      */
     protected abstract Document createDOMDocument();
 
-    public byte getNodeType() {
-        return FONode.NODE_XML_OBJ;
-    }
-
     public Document getDocument() {
         return domDocument;
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -42,10 +41,6 @@
         }
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_ABSTRACT_TABLE_BODY;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -64,10 +63,6 @@
         return "basic-link";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BASIC_LINK;
-    }
-
     /**
      * Override the FONode method, because "this" is the object being sought.
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "bidi-override";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BIDI_OVERRIDE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -62,10 +62,6 @@
         return this;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BLOCK;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -54,10 +53,6 @@
         return true;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BLOCK_CONTAINER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -106,10 +106,6 @@
         return "bookmark";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BOOKMARK;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjMixed;
 import org.foray.fotree.Namespace;
@@ -53,10 +52,6 @@
         return "bookmark-title";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BOOKMARK_TITLE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -63,10 +62,6 @@
         return "bookmark-tree";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_BOOKMARK_TREE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FOText;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
@@ -49,10 +48,6 @@
         return "character";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_CHARACTER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "color-profile";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_COLOR_PROFILE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -26,7 +26,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -122,10 +121,6 @@
         return true;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_COND_PAGE_MASTER_REF;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -46,10 +45,6 @@
         return "declarations";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_DECLARATIONS;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjScaled;
 import org.foray.fotree.Namespace;
@@ -67,10 +66,6 @@
         return "external-graphic";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_EXTERNAL_GRAPHIC;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -46,10 +45,6 @@
         return "float";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_FLOAT;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -84,10 +83,6 @@
         return this;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_FLOW;
-    }
-
     public FONodeProxy makeProxy(ProxyFactory factory) {
         return factory.makeProxy(this);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -45,10 +44,6 @@
         return "footnote";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_FOOTNOTE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -46,10 +45,6 @@
         return "footnote-body";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_FOOTNOTE_BODY;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "initial-property-set";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_INITIAL_PROPERTY_SET;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjMixed;
 import org.foray.fotree.Namespace;
@@ -49,10 +48,6 @@
         return "inline";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_INLINE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "inline-container";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_INLINE_CONTAINER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjScaled;
 import org.foray.fotree.ForeignXML;
@@ -60,10 +59,6 @@
         return "instream-foreign-object";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_INSTREAM_FOREIGN_OBJECT;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -121,10 +120,6 @@
         return (regionClass != null);
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LAYOUT_MASTER_SET;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjMixed;
 import org.foray.fotree.Namespace;
@@ -70,10 +69,6 @@
         return "leader";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LEADER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -44,10 +43,6 @@
         return "list-block";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LIST_BLOCK;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -66,10 +65,6 @@
         return "list-item";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LIST_ITEM;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -46,10 +45,6 @@
         return "list-item-body";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LIST_ITEM_BODY;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "list-item-label";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_LIST_ITEM_LABEL;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -91,10 +91,6 @@
         return "marker";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MARKER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "multi-case";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MULTI_CASE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "multi-properties";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MULTI_PROPERTIES;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "multi-property-set";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MULTI_PROPERTY_SET;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "multi-switch";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MULTI_SWITCH;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -48,10 +47,6 @@
         return "multi-toggle";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_MULTI_TOGGLE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -44,8 +43,4 @@
         super(parent, propertyList, systemId, line, column);
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_PAGE_MASTER_REFERENCE;
-    }
-
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -47,10 +46,6 @@
         return "page-number";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_PAGE_NUMBER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -50,10 +49,6 @@
         return "page-number-citation";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_PAGE_NUMBER_CITATION;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -150,10 +149,6 @@
         return getStaticContent("xsl-footnote-separator");
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_PAGE_SEQUENCE;
-    }
-
     /**
      * Override the FONode method, because there will be no BasicLink objects
      * above this one.

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -153,10 +152,6 @@
         return "page-sequence-master";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_PAGE_SEQUENCE_MASTER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -128,10 +127,6 @@
         return true;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION;
-    }
-
     /**
      * <p>Convenience method reporting the region's horizontal position.</p>
      * @return The X coordinate of the upper left corner of the region's

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -54,10 +53,6 @@
         return "xsl-region-after";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION_AFTER;
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -54,10 +53,6 @@
         return "xsl-region-before";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION_BEFORE;
-    }
-
     /**
      * Inherited documentation: @inheritDoc
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -54,10 +53,6 @@
         return "xsl-region-body";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION_BODY;
-    }
-
     /**
      * Inherited documentation: @inheritDoc
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -53,10 +52,6 @@
         return "xsl-region-end";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION_END;
-    }
-
     /**
      * Inherited documentation: @inheritDoc
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -54,10 +53,6 @@
         return "xsl-region-start";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REGION_START;
-    }
-
     /**
      * Inherited documentation: @inheritDoc
      */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -26,7 +26,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -101,10 +100,6 @@
         this.numberConsumed = 0;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REPEAT_PAGE_MASTER_ALTERN;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -26,7 +26,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -86,10 +85,6 @@
         this.numberConsumed = 0;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_REPEAT_PAGE_MASTER_REF;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -46,10 +45,6 @@
         return "retrieve-marker";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_RETRIEVE_MARKER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FOTreeBuilder;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
@@ -96,10 +95,6 @@
         return "root";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_ROOT;
-    }
-
     /**
      * Overrides the FObj method, because this is the top of the tree.
      * @return Returns the logger.

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -124,10 +123,6 @@
                 + " in same simple-page-master.");
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_SIMPLE_PAGE_MASTER;
-    }
-
     public org.axsl.foR.fo.RegionBody getRegionBody() {
         return this.regionBody;
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -81,10 +80,6 @@
         this.isDone = false;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_SIMPLE_PAGE_MASTER_REF;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -69,10 +68,6 @@
         return "static-content";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_STATIC_CONTENT;
-    }
-
     public FONodeProxy makeProxy(ProxyFactory factory) {
         return factory.makeProxy(this);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -148,10 +148,6 @@
         return this;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -48,10 +47,6 @@
         return "table-and-caption";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_AND_CAPTION;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -45,10 +44,6 @@
         return "table-body";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_BODY;
-    }
-
     public FONodeProxy makeProxy(ProxyFactory factory) {
         return factory.makeProxy(this);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -48,10 +47,6 @@
         return "table-caption";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_CAPTION;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -95,10 +94,6 @@
         return null;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_CELL;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -99,10 +98,6 @@
         return null;
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_COLUMN;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -45,10 +44,6 @@
         return "table-footer";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_FOOTER;
-    }
-
     public FONodeProxy makeProxy(ProxyFactory factory) {
         return factory.makeProxy(this);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.PropertyList;
 
@@ -45,10 +44,6 @@
         return "table-header";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_HEADER;
-    }
-
     public FONodeProxy makeProxy(ProxyFactory factory) {
         return factory.makeProxy(this);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -48,10 +47,6 @@
         return "table-row";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TABLE_ROW;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -48,10 +47,6 @@
         return "title";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_TITLE;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.fo.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjMixed;
 import org.foray.fotree.Namespace;
@@ -54,10 +53,6 @@
         return "wrapper";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_WRAPPER;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -24,7 +24,6 @@
  
 package org.foray.fotree.foray.obj;
 
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
@@ -49,10 +48,6 @@
         return "continued-label";
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_CONTINUED_LABEL;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getExtensionNamespace();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java	2006-06-10 17:05:00 UTC (rev 7512)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java	2006-06-10 17:29:41 UTC (rev 7513)
@@ -25,7 +25,6 @@
 package org.foray.fotree.svg.obj;
 
 import org.foray.common.SVGUserAgent;
-import org.foray.fotree.FONode;
 import org.foray.fotree.FObj;
 import org.foray.fotree.FObjScaled;
 import org.foray.fotree.ForeignXML;
@@ -75,10 +74,6 @@
         return impl.createDocument(svgNS, "svg", null);
     }
 
-    public byte getNodeType() {
-        return FONode.NODE_SVG_ELEMENT;
-    }
-
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getSVGNamespace();
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[FOray-commit] SF.net SVN: foray: [7512] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java

[<vic...@us...>]

Revision: 7512
Author:   victormote
Date:     2006-06-10 10:05:00 -0700 (Sat, 10 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7512&view=rev

Log Message:
-----------
Use new abstract factory to create proxy instances instead of numeric constants.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-10 17:03:25 UTC (rev 7511)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2006-06-10 17:05:00 UTC (rev 7512)
@@ -24,32 +24,40 @@
  
 package org.foray.pioneer;
 
+import org.foray.layout.LayoutStrategy;
+
 import org.axsl.areaW.Area;
+import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.NormalFlowRA;
 import org.axsl.areaW.PageArea;
-import org.axsl.areaW.RegionRABody;
-import org.foray.layout.LayoutStrategy;
-
-import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.PageCollection;
 import org.axsl.areaW.RegionArea;
+import org.axsl.areaW.RegionRABody;
 import org.axsl.common.Constants;
 import org.axsl.foR.FONode;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOText;
 import org.axsl.foR.FObj;
-import org.axsl.foR.FObjMixed;
+import org.axsl.foR.ProxyFactory;
 import org.axsl.foR.extension.ContinuedLabel;
 import org.axsl.foR.fo.BasicLink;
+import org.axsl.foR.fo.BidiOverride;
 import org.axsl.foR.fo.Block;
 import org.axsl.foR.fo.BlockContainer;
+import org.axsl.foR.fo.Bookmark;
+import org.axsl.foR.fo.BookmarkTitle;
 import org.axsl.foR.fo.Character;
+import org.axsl.foR.fo.ColorProfile;
+import org.axsl.foR.fo.Declarations;
 import org.axsl.foR.fo.ExternalGraphic;
+import org.axsl.foR.fo.Float;
 import org.axsl.foR.fo.Flow;
 import org.axsl.foR.fo.Footnote;
 import org.axsl.foR.fo.FootnoteBody;
+import org.axsl.foR.fo.InitialPropertySet;
 import org.axsl.foR.fo.Inline;
+import org.axsl.foR.fo.InlineContainer;
 import org.axsl.foR.fo.InstreamForeignObject;
 import org.axsl.foR.fo.Leader;
 import org.axsl.foR.fo.ListBlock;
@@ -57,19 +65,36 @@
 import org.axsl.foR.fo.ListItemBody;
 import org.axsl.foR.fo.ListItemLabel;
 import org.axsl.foR.fo.Marker;
+import org.axsl.foR.fo.MultiCase;
+import org.axsl.foR.fo.MultiProperties;
+import org.axsl.foR.fo.MultiPropertySet;
+import org.axsl.foR.fo.MultiSwitch;
+import org.axsl.foR.fo.MultiToggle;
 import org.axsl.foR.fo.PageNumber;
 import org.axsl.foR.fo.PageNumberCitation;
 import org.axsl.foR.fo.PageSequence;
 import org.axsl.foR.fo.Region;
+import org.axsl.foR.fo.RegionAfter;
+import org.axsl.foR.fo.RegionBefore;
+import org.axsl.foR.fo.RegionBody;
+import org.axsl.foR.fo.RegionEnd;
+import org.axsl.foR.fo.RegionStart;
 import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.foR.fo.Root;
+import org.axsl.foR.fo.SimplePageMaster;
 import org.axsl.foR.fo.StaticContent;
 import org.axsl.foR.fo.Table;
+import org.axsl.foR.fo.TableAndCaption;
 import org.axsl.foR.fo.TableBody;
+import org.axsl.foR.fo.TableCaption;
 import org.axsl.foR.fo.TableCell;
 import org.axsl.foR.fo.TableColumn;
 import org.axsl.foR.fo.TableFooter;
 import org.axsl.foR.fo.TableHeader;
 import org.axsl.foR.fo.TableRow;
+import org.axsl.foR.fo.Title;
+import org.axsl.foR.fo.Wrapper;
+import org.axsl.foR.svg.SVGElement;
 import org.axsl.text.line.LineBreaker;
 
 import org.apache.commons.logging.Log;
@@ -96,7 +121,7 @@
  * <li>Using the status markers as guides, layout control is returned to the 
  * place where it previously left off.</li>
  */
-public class PioneerLS extends LayoutStrategy {
+public class PioneerLS extends LayoutStrategy implements ProxyFactory {
 
     private LineBreaker currentLineBreaker;
 
@@ -256,243 +281,235 @@
     }
 
     public FONodeProxy makeFObjProxy(FONode node) {
-        switch (node.getNodeType()) {
-        case FONode.NODE_ABSTRACT_FLOW: {
-            return null;
-        }
-        case FONode.NODE_CONTINUED_LABEL: {
-            return new ContinuedLabelPL((ContinuedLabel) node, this);
-        }
-        case FONode.NODE_PAGE_SEQUENCE: {
-            return new NoLayoutPL((PageSequence) node, this);
-        }
-        case FONode.NODE_DESTINATION: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_BOOKMARK_TITLE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_BOOKMARK: {
-            // Outline is a document node & is not laid out.
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_COLOR_PROFILE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_DECLARATIONS: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_TEXT: {
-            return new FOTextPL((FOText) node, this);
-        }
-        case FONode.NODE_TITLE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_UNKNOWN: {
-            // This class has been deleted.
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_UNKNOWN_XML: {
-            // This class has been deleted.
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_XML_ELEMENT: {
-            // This class has been deleted.
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_SVG: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_BIDI_OVERRIDE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_BLOCK: {
-            return new BlockPL((Block) node, this);
-        }
-        case FONode.NODE_BLOCK_CONTAINER: {
-            return new BlockContainerPL((BlockContainer) node, this);
-        }
-        case FONode.NODE_CHARACTER: {
-            return new CharacterPL((Character) node, this);
-        }
-        case FONode.NODE_EXTERNAL_GRAPHIC: {
-            return new ExternalGraphicPL((ExternalGraphic) node, this);
-        }
-        case FONode.NODE_FLOW: {
-            return new FlowPL((Flow) node, this);
-        }
-        case FONode.NODE_FOOTNOTE: {
-            return new FootnotePL((Footnote) node, this);
-        }
-        case FONode.NODE_FLOAT: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_FOOTNOTE_BODY: {
-            return new FootnoteBodyPL((FootnoteBody) node, this);
-        }
-        case FONode.NODE_INITIAL_PROPERTY_SET: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_INLINE: {
-            return new FObjMixedPL((Inline) node, this);
-        }
-        case FONode.NODE_INLINE_CONTAINER: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_INSTREAM_FOREIGN_OBJECT: {
-            return new InstreamForeignObjectPL((InstreamForeignObject) node,
-                    this);
-        }
-        case FONode.NODE_LEADER: {
-            return new LeaderPL((Leader) node, this);
-        }
-        case FONode.NODE_LIST_BLOCK: {
-            return new ListBlockPL((ListBlock) node, this);
-        }
-        case FONode.NODE_LIST_ITEM: {
-            return new ListItemPL((ListItem) node, this);
-        }
-        case FONode.NODE_LIST_ITEM_BODY: {
-            return new ListItemBodyPL((ListItemBody) node, this);
-        }
-        case FONode.NODE_LIST_ITEM_LABEL: {
-            return new ListItemLabelPL((ListItemLabel) node, this);
-        }
-        case FONode.NODE_MARKER: {
-            return new MarkerPL((Marker) node, this);
-        }
-        case FONode.NODE_MULTI_CASE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_MULTI_PROPERTIES: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_MULTI_PROPERTY_SET: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_MULTI_SWITCH: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_MULTI_TOGGLE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_PAGE_NUMBER: {
-            return new PageNumberPL((PageNumber) node, this);
-        }
-        case FONode.NODE_PAGE_NUMBER_CITATION: {
-            return new PageNumberCitationPL((PageNumberCitation) node, this);
-        }
-        case FONode.NODE_RETRIEVE_MARKER: {
-            return new RetrieveMarkerPL((RetrieveMarker) node, this);
-        }
-        case FONode.NODE_STATIC_CONTENT: {
-            return new StaticContentPL((StaticContent) node, this);
-        }
-        case FONode.NODE_TABLE: {
-            return new TablePL((Table) node, this);
-        }
-        case FONode.NODE_TABLE_AND_CAPTION: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_TABLE_BODY: {
-            return new TableBodyPL((TableBody) node, this);
-        }
-        case FONode.NODE_TABLE_CAPTION: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_TABLE_CELL: {
-            return new TableCellPL((TableCell) node, this);
-        }
-        case FONode.NODE_TABLE_COLUMN: {
-            return new NoLayoutPL((TableColumn) node, this);
-        }
-        case FONode.NODE_TABLE_FOOTER: {
-            return new TableFooterPL((TableFooter) node, this);
-        }
-        case FONode.NODE_TABLE_HEADER: {
-            return new TableHeaderPL((TableHeader) node, this);
-        }
-        case FONode.NODE_TABLE_ROW: {
-            return new TableRowPL((TableRow) node, this);
-        }
-        case FONode.NODE_WRAPPER: {
-            return new FObjMixedPL((FObjMixed) node, this);
-        }
-        case FONode.NODE_COND_PAGE_MASTER_REF: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_LAYOUT_MASTER_SET: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_PAGE_SEQUENCE_MASTER: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REGION_AFTER: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REGION_BEFORE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REGION_BODY: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REGION_END: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REGION_START: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REPEAT_PAGE_MASTER_ALTERN: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_REPEAT_PAGE_MASTER_REF: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_ROOT: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_SIMPLE_PAGE_MASTER: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_SIMPLE_PAGE_MASTER_REF: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_EXTENSION: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_FOBJ: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_FOBJ_MIXED: {
-            return new FObjMixedPL((FObjMixed) node, this);
-        }
-        case FONode.NODE_TO_BE_IMPLEMENTED: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_XML_OBJ: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_BASIC_LINK: {
-            return new FObjMixedPL((BasicLink) node, this);
-        }
-        case FONode.NODE_ABSTRACT_TABLE_BODY: {
-            return null;
-        }
-        case FONode.NODE_REGION: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_PAGE_MASTER_REFERENCE: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        case FONode.NODE_SVG_ELEMENT: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        default: {
-            return new NoLayoutPL((FObj) node, this);
-        }
-        }
+        return node.makeProxy(this);
     }
 
+    public FONodeProxy makeProxy(FONode node) {
+        /* TODO: Remove this cast. NoLayoutPL should probably take an FONode
+         * instead of FObj. */
+        return new NoLayoutPL((FObj) node, this);
+    }
+
+    public FONodeProxy makeProxy(ContinuedLabel node) {
+        return new ContinuedLabelPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(PageSequence node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(BookmarkTitle node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Bookmark node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ColorProfile node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Declarations node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(FOText node) {
+        return new FOTextPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Title node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(BidiOverride node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Block node) {
+        return new BlockPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(BlockContainer node) {
+        return new BlockContainerPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Character node) {
+        return new CharacterPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ExternalGraphic node) {
+        return new ExternalGraphicPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Flow node) {
+        return new FlowPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Footnote node) {
+        return new FootnotePL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Float node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(FootnoteBody node) {
+        return new FootnoteBodyPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(InitialPropertySet node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Inline node) {
+        return new FObjMixedPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(InlineContainer node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(InstreamForeignObject node) {
+        return new InstreamForeignObjectPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Leader node) {
+        return new LeaderPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ListBlock node) {
+        return new ListBlockPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ListItem node) {
+        return new ListItemPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ListItemBody node) {
+        return new ListItemBodyPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(ListItemLabel node) {
+        return new ListItemLabelPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Marker node) {
+        return new MarkerPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(MultiCase node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(MultiProperties node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(MultiPropertySet node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(MultiSwitch node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(MultiToggle node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(PageNumber node) {
+        return new PageNumberPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(PageNumberCitation node) {
+        return new PageNumberCitationPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RetrieveMarker node) {
+        return new RetrieveMarkerPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(StaticContent node) {
+        return new StaticContentPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Table node) {
+        return new TablePL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableAndCaption node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableBody node) {
+        return new TableBodyPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableCaption node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableCell node) {
+        return new TableCellPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableColumn node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableFooter node) {
+        return new TableFooterPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableHeader node) {
+        return new TableHeaderPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(TableRow node) {
+        return new TableRowPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Wrapper node) {
+        return new FObjMixedPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RegionAfter node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RegionBefore node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RegionBody node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RegionEnd node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(RegionStart node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(Root node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(SimplePageMaster node) {
+        return new NoLayoutPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(BasicLink node) {
+        return new FObjMixedPL(node, this);
+    }
+
+    public FONodeProxy makeProxy(SVGElement node) {
+        return new NoLayoutPL(node, this);
+    }
+
     public static final byte[] listUnsupportedObjectsFO() {
         return new byte[] {
                Constants.FO_BIDI_OVERRIDE,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.