axsl-commit — aXSL repository commit log messages

[aXSL-commit] SF.net SVN: axsl: [586] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java

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

Revision: 586
Author:   victormote
Date:     2006-05-25 12:17:22 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=586&view=rev

Log Message:
-----------
Add some convenience methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-25 16:04:40 UTC (rev 585)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-25 19:17:22 UTC (rev 586)
@@ -20,6 +20,7 @@
  
 package org.axsl.areaW;
 
+import org.axsl.common.Constants;
 import org.axsl.common.OrderedTreeNode;
 import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
@@ -62,6 +63,24 @@
      */
     public Area nearestGeneratedByBlockLevelFO() ;
 
+    /**
+     * Convenience method to return the BPD of the content rectangle of the Area
+     * returned by {@link #nearestGeneratedByBlockLevelFO()}.
+     * @return The BPD of the content rectangle of the nearest Area that was
+     * generated by a block-level FO, or {@link Constants#DIMENSION_AUTO} if
+     * there is none.
+     */
+    public int crBPDNearestGeneratedByBlockLevelFO() ;
+
+    /**
+     * Convenience method to return the IPD of the content rectangle of the Area
+     * returned by {@link #nearestGeneratedByBlockLevelFO()}.
+     * @return The IPD of the content rectangle of the nearest Area that was
+     * generated by a block-level FO, or {@link Constants#DIMENSION_AUTO} if
+     * there is none.
+     */
+    public int crIPDNearestGeneratedByBlockLevelFO() ;
+
     public TableArea ancestorTableArea();
 
 }


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

[aXSL-commit] SF.net SVN: axsl: [585] trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java

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

Revision: 585
Author:   victormote
Date:     2006-05-25 09:04:40 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=585&view=rev

Log Message:
-----------
Add method for computing normal line-height.

Modified Paths:
--------------
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java
Modified: trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java
===================================================================
--- trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java	2006-05-24 20:50:19 UTC (rev 584)
+++ trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/Font.java	2006-05-25 16:04:40 UTC (rev 585)
@@ -156,6 +156,11 @@
      */
     public static final byte FORMAT_OTF_CFF = 4;
 
+    /** Normal line-height computation constant indicating that the
+     * implementation is in complete control of the normal line-height
+     * computation. */
+    public static final byte LH_ALGORITHM_DEFAULT = 0;
+
     /**
      * Returns the Ascender value for this font, scaled to a specific point
      * size.
@@ -366,4 +371,33 @@
      */
     public boolean isPDFStandardFont();
 
+    /**
+     * <p>Returns a factor suitable for computing a "normal" line-height as
+     * defined in the CSS and XSL-FO standards.
+     * The line-height is the distance, including leading, between the baselines
+     * of stacked lines of text.
+     * The CSS and XSL-FO standards recommend that the "normal" value for
+     * line-height fall between 1.0 and 1.2. (see Section 7.15.4 of XSL-FO
+     * 1.0)
+     * This method attempts to find a suitable value based on the
+     * characteristics of the font itself.</p>
+     *
+     * <p>Design Note 1: This method returns a float factor instead of a
+     * computation of the actual line-height to facilitate the handling of
+     * inheritance where that is required.
+     * For example, for CSS and XSL-FO, the factor is what is inherited instead
+     * of the computed line-height.</p>
+     *
+     * @param algorithm The specifier of an algorithm that should be used to
+     * compute the factor.
+     * Valid values include {@link #LH_ALGORITHM_DEFAULT}, which puts the
+     * implementation in complete control of the computation.
+     * Other algorithms may be added in the future.
+     * @return The factor to be applied to the font-size to compute the "normal"
+     * line-height.
+     * For example, if the font-size is 12 points, and this method returns 1.2,
+     * the computed "normal" line-height is 14.4 points.
+     */
+    public float normalLineHeightFactor(int algorithm) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [584] trunk/axsl/axsl-font-r/src/java/org/axsl/fontR

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

Revision: 584
Author:   victormote
Date:     2006-05-24 13:50:19 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=584&view=rev

Log Message:
-----------
1. Add factory method to FontServer that creates implementation-specific FontConsumer instances.
2. Add method to FontConsumer allowing it to set valid font sources.

Modified Paths:
--------------
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontConsumer.java
    trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontServer.java
Modified: trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontConsumer.java
===================================================================
--- trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontConsumer.java	2006-05-24 19:16:14 UTC (rev 583)
+++ trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontConsumer.java	2006-05-24 20:50:19 UTC (rev 584)
@@ -41,6 +41,18 @@
 public interface FontConsumer {
 
     /**
+     * Free standing fonts are those fonts which are available to the
+     * application through means other than the operating system.
+     */
+    public static final byte FONT_SOURCE_FREE_STANDING = 0;
+
+    /**
+     * System fonts are those fonts which are available to the application
+     * through the operating system.
+     */
+    public static final byte FONT_SOURCE_SYSTEM = 1;
+
+    /**
      * Accepts the client's description of the desired font, and returns the
      * best-fitting Font found, using the algorithm specified by the XSL-FO
      * 1.1 Standard.
@@ -171,4 +183,24 @@
      */
     public void optimizeFonts();
 
+    /**
+     * Sets the font sources that can be selected for this FontConsumer.
+     * Please note that implementations are not required to support either
+     * free-standing or system fonts, although they should presumably support
+     * at least one.
+     * This method is provided for implementations that want to use this
+     * information during font selection, but implementations are not required
+     * to do anything with the values set here.
+     * @param fontSources The array of valid font sources that can be used by
+     * this consumer.
+     * Valid array values are {@link #FONT_SOURCE_FREE_STANDING} and
+     * {@link #FONT_SOURCE_SYSTEM}.
+     * The order of the array signifies the order of preference for selection
+     * purposes.
+     * For example, if both system fonts and free-standing fonts can be used,
+     * but free-standing fonts are preferred, the array should contain
+     * { FONT_SOURCE_FREE_STANDING, FONT_SOURCE_SYSTEM };
+     */
+    public void setFontSources(int[] fontSources);
+
 }

Modified: trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontServer.java
===================================================================
--- trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontServer.java	2006-05-24 19:16:14 UTC (rev 583)
+++ trunk/axsl/axsl-font-r/src/java/org/axsl/fontR/FontServer.java	2006-05-24 20:50:19 UTC (rev 584)
@@ -271,4 +271,10 @@
             float simulatedBackslant, float[] simulatedStretch)
             throws FontException ;
 
+    /**
+     * Creates an implementation-specific {@link FontConsumer} instance.
+     * @return an implementation-specific {@link FontConsumer} instance.
+     */
+    public FontConsumer makeFontConsumer() ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [583] trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java

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

Revision: 583
Author:   victormote
Date:     2006-05-24 12:16:14 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=583&view=rev

Log Message:
-----------
Add new factory interface.

Added Paths:
-----------
    trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java
Added: trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java
===================================================================
--- trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java	                        (rev 0)
+++ trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java	2006-05-24 19:16:14 UTC (rev 583)
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+ 
+package org.axsl.layout;
+
+/**
+ * Creates implementation-specific {@link Layout} instances.
+ */
+public interface LayoutFactory {
+
+    /**
+     * Create a {@link Layout} instance.
+     * @return An implementation-specific instance of an {@link Layout}.
+     */
+    public Layout makeLayout();
+
+}


Property changes on: trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutFactory.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [582] trunk/axsl/scripts/build.xml

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

Revision: 582
Author:   victormote
Date:     2006-05-24 11:54:15 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=582&view=rev

Log Message:
-----------
Add new module to build.

Modified Paths:
--------------
    trunk/axsl/scripts/build.xml
Modified: trunk/axsl/scripts/build.xml
===================================================================
--- trunk/axsl/scripts/build.xml	2006-05-24 18:43:55 UTC (rev 581)
+++ trunk/axsl/scripts/build.xml	2006-05-24 18:54:15 UTC (rev 582)
@@ -24,7 +24,7 @@
 
 <!-- Retrieve externally-configured properties. -->
     <property file="${axsl.config}/axsl-build.properties"/>
-   
+
 <!-- If the AXSL_HOME env variable exists, use it -->
     <available property="project.root"
       file="${env.AXSL_HOME}/scripts/build.xml"
@@ -83,6 +83,7 @@
       <src path="${project.root}/axsl-text/src/java"/>
       <src path="${project.root}/axsl-fo-r/src/java"/>
       <src path="${project.root}/axsl-area-w/src/java"/>
+      <src path="${project.root}/axsl-layout/src/java"/>
       <src path="${project.root}/axsl-area-r/src/java"/>
       <src path="${project.root}/axsl-pdf-w/src/java"/>
     </javac>
@@ -149,6 +150,7 @@
         <pathelement path="${project.root}/axsl-text/src/java"/>
         <pathelement path="${project.root}/axsl-fo-r/src/java"/>
         <pathelement path="${project.root}/axsl-area-w/src/java"/>
+        <pathelement path="${project.root}/axsl-layout/src/java"/>
         <pathelement path="${project.root}/axsl-area-r/src/java"/>
         <pathelement path="${project.root}/axsl-pdf-w/src/java"/>
       </sourcepath>
@@ -180,6 +182,10 @@
         <package name="org.axsl.areaW"/>
         <package name="org.axsl.areaW.*"/>
       </group>
+      <group title="The aXSL Layout Module">
+        <package name="org.axsl.layout"/>
+        <package name="org.axsl.layout.*"/>
+      </group>
       <group title="The aXSL Area Tree Reader Module">
         <package name="org.axsl.areaR"/>
         <package name="org.axsl.areaR.*"/>


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

[aXSL-commit] SF.net SVN: axsl: [581] trunk/axsl/axsl-layout

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

Revision: 581
Author:   victormote
Date:     2006-05-24 11:43:55 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=581&view=rev

Log Message:
-----------
1. Add exception class.
2. Add method for laying out content.

Modified Paths:
--------------
    trunk/axsl/axsl-layout/.classpath
    trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java

Added Paths:
-----------
    trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutException.java
Modified: trunk/axsl/axsl-layout/.classpath
===================================================================
--- trunk/axsl/axsl-layout/.classpath	2006-05-24 18:26:33 UTC (rev 580)
+++ trunk/axsl/axsl-layout/.classpath	2006-05-24 18:43:55 UTC (rev 581)
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java
===================================================================
--- trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java	2006-05-24 18:26:33 UTC (rev 580)
+++ trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java	2006-05-24 18:43:55 UTC (rev 581)
@@ -20,6 +20,19 @@
  
 package org.axsl.layout;
 
+import org.axsl.areaW.AreaWException;
+import org.axsl.areaW.PageCollection;
+
 public interface Layout {
 
+    /**
+     * Lays out content by creating the needed content in the given
+     * PageCollection to satisfy the PageCollection's cousin PageSequence in the
+     * FOTree.
+     * @param pageCollection A PageCollection instance from the AreaTree.
+     * @throws AreaWException For errors during layout.
+     */
+    public void formatPageSequence(PageCollection pageCollection)
+            throws LayoutException, AreaWException ;
+
 }

Added: trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutException.java
===================================================================
--- trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutException.java	                        (rev 0)
+++ trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutException.java	2006-05-24 18:43:55 UTC (rev 581)
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ * 
+ */
+
+/* $Id$ */
+ 
+package org.axsl.layout;
+
+/**
+ * Exception thrown when an axslLayout implementation has a problem.
+ */
+public class LayoutException extends Exception {
+
+    static final long serialVersionUID = 400382216933178535L;
+
+    /**
+     * Create a new LayoutException.
+     * Identical to {@link Exception#Exception(java.lang.String)}
+     * @see Exception#Exception(java.lang.String)
+     */
+    public LayoutException(String message) {
+        super(message);
+    }
+
+    /**
+     * Create a new LayoutException.
+     * Identical to {@link Exception#Exception(java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.Throwable)
+     */
+    public LayoutException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Create a new LayoutException.
+     * Identical to {@link Exception#Exception(java.lang.String,
+     * java.lang.Throwable)}
+     * @see Exception#Exception(java.lang.String, java.lang.Throwable)
+     */
+    public LayoutException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}


Property changes on: trunk/axsl/axsl-layout/src/java/org/axsl/layout/LayoutException.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [580] trunk/axsl

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

Revision: 580
Author:   victormote
Date:     2006-05-24 11:26:33 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=580&view=rev

Log Message:
-----------
Add new package for layout systems.

Added Paths:
-----------
    trunk/axsl/axsl-layout/
    trunk/axsl/axsl-layout/.checkstyle
    trunk/axsl/axsl-layout/.classpath
    trunk/axsl/axsl-layout/.project
    trunk/axsl/axsl-layout/src/
    trunk/axsl/axsl-layout/src/java/
    trunk/axsl/axsl-layout/src/java/org/
    trunk/axsl/axsl-layout/src/java/org/axsl/
    trunk/axsl/axsl-layout/src/java/org/axsl/layout/
    trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java

Property changes on: trunk/axsl/axsl-layout
___________________________________________________________________
Name: svn:ignore
   + build
zzlocal


Added: trunk/axsl/axsl-layout/.checkstyle
===================================================================
--- trunk/axsl/axsl-layout/.checkstyle	                        (rev 0)
+++ trunk/axsl/axsl-layout/.checkstyle	2006-05-24 18:26:33 UTC (rev 580)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+    <fileset name="all" enabled="true" check-config-name="aXSL Checkstyle" local="false">
+        <file-match-pattern match-pattern="." include-pattern="true"/>
+    </fileset>
+</fileset-config>

Added: trunk/axsl/axsl-layout/.classpath
===================================================================
--- trunk/axsl/axsl-layout/.classpath	                        (rev 0)
+++ trunk/axsl/axsl-layout/.classpath	2006-05-24 18:26:33 UTC (rev 580)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="build/eclipse"/>
+</classpath>

Added: trunk/axsl/axsl-layout/.project
===================================================================
--- trunk/axsl/axsl-layout/.project	                        (rev 0)
+++ trunk/axsl/axsl-layout/.project	2006-05-24 18:26:33 UTC (rev 580)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>axslLayout</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java
===================================================================
--- trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java	                        (rev 0)
+++ trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java	2006-05-24 18:26:33 UTC (rev 580)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+ 
+package org.axsl.layout;
+
+public interface Layout {
+
+}


Property changes on: trunk/axsl/axsl-layout/src/java/org/axsl/layout/Layout.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [579] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java

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

Revision: 579
Author:   victormote
Date:     2006-05-24 09:55:04 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=579&view=rev

Log Message:
-----------
Add interface that creates implementation-specific AreaTree objects.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java	2006-05-24 16:55:04 UTC (rev 579)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+ 
+package org.axsl.areaW;
+
+import org.axsl.foR.fo.Root;
+
+/**
+ * Creates implementation-specific {@link AreaTree} instances.
+ */
+public interface AreaTreeFactory {
+
+    /**
+     * Create an {@link AreaTree} instance.
+     * @param root The {@link Root} instance for which the AreaTree is being
+     * created.
+     * @return An implementation-specific instance of an {@link AreaTree}.
+     */
+    public AreaTree makeAreaTree(Root root);
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTreeFactory.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [578] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java

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

Revision: 578
Author:   victormote
Date:     2006-05-24 09:10:49 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=578&view=rev

Log Message:
-----------
Add method to register an event listener.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-24 16:10:22 UTC (rev 577)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaTree.java	2006-05-24 16:10:49 UTC (rev 578)
@@ -24,7 +24,6 @@
 import org.axsl.foR.fo.PageSequence;
 import org.axsl.foR.fo.Root;
 
-
 /**
  * An AreaTree is a document that has been laid out on pages.
  */
@@ -42,4 +41,11 @@
      */
     public void layoutDocumentNodes(Root rootFObj) throws AreaWException ;
 
+    /**
+     * Registers a listener for notification of {@link AreaTreeEvent} firings.
+     * @param listener The listener object which should be notified about
+     * {@link AreaTreeEvent} firings.
+     */
+    public void registerListener (AreaTreeListener listener) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [577] trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java

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

Revision: 577
Author:   victormote
Date:     2006-05-24 09:10:22 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=577&view=rev

Log Message:
-----------
Clean up doc a bit.

Modified Paths:
--------------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java
Modified: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	2006-05-24 16:04:00 UTC (rev 576)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	2006-05-24 16:10:22 UTC (rev 577)
@@ -44,9 +44,9 @@
     public Root getRootFObj() ;
 
     /**
-     * Add an object to the collection of objects that should be notified about
-     * FOTreeEvent firings.
-     * @param listener the Object which should be notified
+     * Registers a listener for notification of {@link FOTreeEvent} firings.
+     * @param listener The listener object which should be notified about
+     * {@link FOTreeEvent} firings.
      */
     public void registerListener (FOTreeListener listener) ;
 


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

[aXSL-commit] SF.net SVN: axsl: [576] trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java

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

Revision: 576
Author:   victormote
Date:     2006-05-24 09:04:00 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=576&view=rev

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

Modified Paths:
--------------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java
Modified: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	2006-05-24 15:18:04 UTC (rev 575)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	2006-05-24 16:04:00 UTC (rev 576)
@@ -48,7 +48,7 @@
      * FOTreeEvent firings.
      * @param listener the Object which should be notified
      */
-    public void addFOTreeListener (FOTreeListener listener) ;
+    public void registerListener (FOTreeListener listener) ;
 
     /**
      * The client application can use this method to add a list of FO objects


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

[aXSL-commit] SF.net SVN: axsl: [575] trunk/axsl/axsl-fo-r/src/java/org/axsl/foR

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

Revision: 575
Author:   victormote
Date:     2006-05-24 08:18:04 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=575&view=rev

Log Message:
-----------
Rename some interfaces and methods for clarity.

Added Paths:
-----------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeFactory.java

Removed Paths:
-------------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java
Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java (from rev 509, trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTree.java	2006-05-24 15:18:04 UTC (rev 575)
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+ 
+package org.axsl.foR;
+
+import org.axsl.foR.fo.Root;
+import org.axsl.fontR.FontConsumer;
+import org.axsl.graphicR.GraphicServer;
+import org.axsl.text.TextServer;
+
+import org.xml.sax.ContentHandler;
+
+import java.net.URL;
+
+/**
+ * An FOTreeBuilder is created for each document that is processed.
+ * It is conceptually directly under the FOTreeServer (which can be used for
+ * multiple documents and which generally creates FOTreeBuilder instances).
+ * Whereas FOTreeControl represents the client application to the FOTree
+ * implementation, FOTreeBuilder represents the FOTree implementation to the
+ * client application.
+ */
+public interface FOTree extends ContentHandler {
+
+    public boolean hasData() ;
+
+    public Root getRootFObj() ;
+
+    /**
+     * Add an object to the collection of objects that should be notified about
+     * FOTreeEvent firings.
+     * @param listener the Object which should be notified
+     */
+    public void addFOTreeListener (FOTreeListener listener) ;
+
+    /**
+     * The client application can use this method to add a list of FO objects
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The object will be created within the FOTree, but the
+     * user will receive a logged message warning them that the object is not
+     * supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedObjectsFO An array of bytes, each element of which
+     * represents an element which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#objectNameList}.
+     */
+    public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) ;
+
+    /**
+     * The client application can use this method to add a list of FO properties
+     * that it does not support, and that it wishes to have flagged for the
+     * user at parse time. The property will be created within the FOTree, but
+     * the user will receive a logged message warning them that the object is
+     * not supported.
+     * Note that multiple arrays can be added, and the relationship is OR, so
+     * that if a given item appears in any one or more of the arrays, it will
+     * be flagged.
+     * @param unsupportedPropertiesFO An array of shorts, each element of which
+     * represents an attribute which should be flagged to the user.
+     * Valid element values are members of
+     * {@link org.axsl.common.Constants#propertyNameList}.
+     */
+    public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) ;
+
+    public void setGraphicServer(GraphicServer graphicServer) ;
+
+    public void setTextServer(TextServer textServer) ;
+
+    public void setFontConsumer(FontConsumer consumer) ;
+
+    public void setGraphicSearchPath(URL[] graphicSearchPath);
+
+    public void setCachingGraphics(boolean cachingGraphics);
+
+}

Deleted: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java	2006-05-08 23:55:54 UTC (rev 574)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeBuilder.java	2006-05-24 15:18:04 UTC (rev 575)
@@ -1,95 +0,0 @@
-/*
- * Copyright 2005 The aXSL Project.
- *      http://www.axsl.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.
- *
- */
-
-/* $Id$ */
- 
-package org.axsl.foR;
-
-import org.axsl.foR.fo.Root;
-import org.axsl.fontR.FontConsumer;
-import org.axsl.graphicR.GraphicServer;
-import org.axsl.text.TextServer;
-
-import org.xml.sax.ContentHandler;
-
-import java.net.URL;
-
-/**
- * An FOTreeBuilder is created for each document that is processed.
- * It is conceptually directly under the FOTreeServer (which can be used for
- * multiple documents and which generally creates FOTreeBuilder instances).
- * Whereas FOTreeControl represents the client application to the FOTree
- * implementation, FOTreeBuilder represents the FOTree implementation to the
- * client application.
- */
-public interface FOTreeBuilder extends ContentHandler {
-
-    public boolean hasData() ;
-
-    public Root getRootFObj() ;
-
-    /**
-     * Add an object to the collection of objects that should be notified about
-     * FOTreeEvent firings.
-     * @param listener the Object which should be notified
-     */
-    public void addFOTreeListener (FOTreeListener listener) ;
-
-    /**
-     * The client application can use this method to add a list of FO objects
-     * that it does not support, and that it wishes to have flagged for the
-     * user at parse time. The object will be created within the FOTree, but the
-     * user will receive a logged message warning them that the object is not
-     * supported.
-     * Note that multiple arrays can be added, and the relationship is OR, so
-     * that if a given item appears in any one or more of the arrays, it will
-     * be flagged.
-     * @param unsupportedObjectsFO An array of bytes, each element of which
-     * represents an element which should be flagged to the user.
-     * Valid element values are members of
-     * {@link org.axsl.common.Constants#objectNameList}.
-     */
-    public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) ;
-
-    /**
-     * The client application can use this method to add a list of FO properties
-     * that it does not support, and that it wishes to have flagged for the
-     * user at parse time. The property will be created within the FOTree, but
-     * the user will receive a logged message warning them that the object is
-     * not supported.
-     * Note that multiple arrays can be added, and the relationship is OR, so
-     * that if a given item appears in any one or more of the arrays, it will
-     * be flagged.
-     * @param unsupportedPropertiesFO An array of shorts, each element of which
-     * represents an attribute which should be flagged to the user.
-     * Valid element values are members of
-     * {@link org.axsl.common.Constants#propertyNameList}.
-     */
-    public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) ;
-
-    public void setGraphicServer(GraphicServer graphicServer) ;
-
-    public void setTextServer(TextServer textServer) ;
-
-    public void setFontConsumer(FontConsumer consumer) ;
-
-    public void setGraphicSearchPath(URL[] graphicSearchPath);
-
-    public void setCachingGraphics(boolean cachingGraphics);
-
-}

Copied: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeFactory.java (from rev 509, trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java)
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeFactory.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeFactory.java	2006-05-24 15:18:04 UTC (rev 575)
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2005 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+ 
+package org.axsl.foR;
+
+/**
+ * Creates implementation-specific {@link FOTree} instances.
+ */
+public interface FOTreeFactory {
+
+    /**
+     * Create an {@link FOTree} instance to process a document.
+     * @return An implementation-specific instance of an {@link FOTree}.
+     */
+    public FOTree makeFOTree();
+
+}

Deleted: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java	2006-05-08 23:55:54 UTC (rev 574)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FOTreeServer.java	2006-05-24 15:18:04 UTC (rev 575)
@@ -1,37 +0,0 @@
-/*
- * Copyright 2005 The aXSL Project.
- *      http://www.axsl.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.
- *
- */
-
-/* $Id$ */
- 
-package org.axsl.foR;
-
-/**
- * The top-level object in the FOTree implementation.
- * FOTreeServer encapsulates the FOTree at a high level of abstraction for a
- * client application.
- */
-public interface FOTreeServer {
-
-    /**
-     * Create a an FOTreeBuilder instance to process a document.
-     * @return An implementation of FOTreeBuilder that is in conformity with
-     * this server's processing.
-     */
-    public FOTreeBuilder makeTreeBuilder();
-
-}


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

[aXSL-commit] SF.net SVN: axsl: [547] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 547
Author:   victormote
Date:     2006-05-08 07:40:25 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=547&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 13:59:07 UTC (rev 546)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 14:40:25 UTC (rev 547)
@@ -46,4 +46,6 @@
 
     public FObj traitGeneratedBy() ;
 
+    public NormalBlockArea ancestorWritableNormalBlockArea() ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 13:59:07 UTC (rev 546)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 14:40:25 UTC (rev 547)
@@ -29,5 +29,16 @@
      */
     public void completeCurrentLine() ;
 
+    /**
+     * Get the current line area in this block area.
+     * This is used to get the current line area for adding
+     * inline objects.
+     * This will return null if there is not enough room left
+     * in the block area to accomodate the line area.
+     *
+     * @return the line area to be used to add inline objects
+     */
+    public LineArea getWritableCurrentLineArea() ;
+
 }
 


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

[aXSL-commit] SF.net SVN: axsl: [534] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java

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

Revision: 534
Author:   victormote
Date:     2006-05-07 15:19:04 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=534&view=rev

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

Removed Paths:
-------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
Deleted: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 22:07:24 UTC (rev 533)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 22:19:04 UTC (rev 534)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2006 The aXSL Project.
- *      http://www.axsl.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.
- *
- */
-
-/* $Id$ */
-
-package org.axsl.areaW;
-
-import org.axsl.foR.fo.PageSequence;
-import org.axsl.foR.fo.Region;
-
-public interface LayoutStrategy {
-
-    public void layoutStaticContent(PageSequence pageSequence,
-            Region region, RegionArea regionArea) throws AreaWException ;
-
-    /**
-     * Create the needed content in the given PageCollection to satisfy
-     * the PageCollection's PageSequence in the FOTree.
-     * @param pageCollection The PageCollection instance to be laid out.
-     * @throws AreaWException For errors during layout.
-     */
-    public void formatPageSequence(PageCollection pageCollection)
-            throws AreaWException ;
-
-    public void formatStaticContent(PageArea pageArea) throws AreaWException;
-
-}


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

[aXSL-commit] SF.net SVN: axsl: [548] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java

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

Revision: 548
Author:   victormote
Date:     2006-05-08 07:51:38 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=548&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 14:40:25 UTC (rev 547)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 14:51:38 UTC (rev 548)
@@ -40,5 +40,6 @@
      */
     public LineArea getWritableCurrentLineArea() ;
 
+    public LineArea createNextLineArea();
+
 }
-


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

[aXSL-commit] SF.net SVN: axsl: [519] trunk/axsl/axsl-fo-r/src/java/org/axsl/foR

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

Revision: 519
Author:   victormote
Date:     2006-05-06 09:10:32 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=519&view=rev

Log Message:
-----------
Add new marker interface to be used to store Area Tree "generated by" information, and require FONodes to set and get it.

Modified Paths:
--------------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java

Added Paths:
-----------
    trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeResult.java
Modified: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java	2006-05-06 15:56:26 UTC (rev 518)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONode.java	2006-05-06 16:10:32 UTC (rev 519)
@@ -135,9 +135,21 @@
     public FONodeProxy getProxy() ;
 
     /**
+     * Sets a result set for this FONode.
+     * @param result The FONodeResult to be set for this node.
+     */
+    public void setResult(FONodeResult result) ;
+
+    /**
+     * Returns the FONodeResult instance, if any, associated with this object.
+     * @return The current result for this FONode instance.
+     */
+    public FONodeResult getResult() ;
+
+    /**
      * Resets this node and all child nodes so that they can be reused.
-     * Specifically, all references to FONodeProxy instances should be
-     * dereferenced by implementations.
+     * Specifically, all references to {@link FONodeProxy} and
+     * {@link FONodeResult} instances should be dereferenced by implementations.
      * Running reset on the FORoot instance should reset the entire FOTree
      * for reuse.
      */

Added: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeResult.java
===================================================================
--- trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeResult.java	                        (rev 0)
+++ trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeResult.java	2006-05-06 16:10:32 UTC (rev 519)
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.foR;
+
+/**
+ * <p>Marker interface that allows an FOTree client to embed information about
+ * the results of the client's processing into the FONode without the FOTree
+ * needing to know the details of that those results.
+ * For example, a typical use of the FOTree is as input to a layout system that
+ * will create an AreaTree from it.
+ * The AreaTree or layout system can use the FONodeResult to store an object
+ * that will keep track of the which Area nodes were created by which FO
+ * nodes.</p>
+ */
+public interface FONodeResult {
+
+}


Property changes on: trunk/axsl/axsl-fo-r/src/java/org/axsl/foR/FONodeResult.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [552] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 552
Author:   victormote
Date:     2006-05-08 08:45:04 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=552&view=rev

Log Message:
-----------
Add new interfaces.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockContainerRA.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/ContainerRA.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/GenericContainer.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableBodyContainer.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableFooterContainer.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableHeaderContainer.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockContainerRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockContainerRA.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockContainerRA.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface BlockContainerRA extends ContainerRA {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/BlockContainerRA.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/ContainerRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/ContainerRA.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/ContainerRA.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface ContainerRA extends AreaFlexible {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/ContainerRA.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/GenericContainer.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/GenericContainer.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/GenericContainer.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface GenericContainer extends ContainerRA {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/GenericContainer.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableBodyContainer.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableBodyContainer.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableBodyContainer.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface TableBodyContainer extends GenericContainer {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableBodyContainer.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableFooterContainer.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableFooterContainer.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableFooterContainer.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface TableFooterContainer extends GenericContainer {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableFooterContainer.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native

Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableHeaderContainer.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableHeaderContainer.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableHeaderContainer.java	2006-05-08 15:45:04 UTC (rev 552)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface TableHeaderContainer extends GenericContainer {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/TableHeaderContainer.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [555] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 555
Author:   victormote
Date:     2006-05-08 09:59:17 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=555&view=rev

Log Message:
-----------
Add needed methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 16:41:38 UTC (rev 554)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/Area.java	2006-05-08 16:59:17 UTC (rev 555)
@@ -24,6 +24,7 @@
  
 package org.axsl.areaW;
 
+import org.axsl.foR.fo.Block;
 import org.axsl.foR.fo.TableBody;
 import org.axsl.foR.fo.TableFooter;
 import org.axsl.foR.fo.TableHeader;
@@ -55,4 +56,12 @@
     public TableFooterContainer makeTableFooterContainer(
             TableFooter tableFooter);
 
+    public NormalBlockArea makeNormalBlockArea(Block block);
+
+    /**
+     * @return The amount of space, in millipoints, available in this Area for
+     * expansion in the progression direction.
+     */
+    public int progressionDimensionAvailable();
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-08 16:41:38 UTC (rev 554)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-08 16:59:17 UTC (rev 555)
@@ -20,6 +20,7 @@
  
 package org.axsl.areaW;
 
+import org.axsl.foR.FObj;
 import org.axsl.foR.fo.PageSequence;
 
 /**
@@ -61,4 +62,17 @@
 
     public int getPageCount() ;
 
+    /**
+     * Finds or creates the SpanRA instance in which nextFObj should start
+     * being laid out.
+     * @param lastFObj The last FObj that was laid out, null if nextFObj is the
+     * first one for this page-sequence.
+     * @param nextFObj The FObj for which we are trying to find the staring
+     * Area for layout.
+     * @return The ColumnRA instance into which nextFObj should be laid out.
+     * @throws AreaWException For errors creating the appropriate Areas.
+     */
+    public SpanRA startingReferenceArea(FObj lastFObj, FObj nextFObj)
+            throws AreaWException ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java	2006-05-08 16:41:38 UTC (rev 554)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/SpanRA.java	2006-05-08 16:59:17 UTC (rev 555)
@@ -20,6 +20,8 @@
  
 package org.axsl.areaW;
 
+import org.axsl.foR.FObj;
+
 /**
  * Represents a span-reference-area.
  * The standard does not seem to tell us what if any FO generates a
@@ -32,4 +34,11 @@
 
     public void setCurrentColumn(int columnNumber) ;
 
+    /**
+     * Returns a NormalFlowRA to contain fo.
+     * @param fo The FObj instance whose to be contained.
+     * @return SpanRA The NormalFlowRA instance into which fo should be placed.
+     */
+    public NormalFlowRA normalFlowForNextFO(FObj fo) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [560] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW

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

Revision: 560
Author:   victormote
Date:     2006-05-08 11:20:18 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=560&view=rev

Log Message:
-----------
1. Add new superinterface for OrderedTreeNodes.
2. Fix some hierarchy problems.
3. Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java

Added Paths:
-----------
    trunk/axsl/axsl-common/src/java/org/axsl/common/OrderedTreeNode.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 17:49:55 UTC (rev 559)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 18:20:18 UTC (rev 560)
@@ -20,12 +20,13 @@
  
 package org.axsl.areaW;
 
+import org.axsl.common.OrderedTreeNode;
 import org.axsl.foR.FONode;
 import org.axsl.foR.FObj;
 
 import java.util.List;
 
-public interface AreaNode {
+public interface AreaNode extends OrderedTreeNode {
 
     public AreaNode getWritableParent() ;
 

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-08 17:49:55 UTC (rev 559)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-08 18:20:18 UTC (rev 560)
@@ -21,6 +21,7 @@
 package org.axsl.areaW;
 
 import org.axsl.foR.fo.FootnoteBody;
+import org.axsl.foR.fo.Marker;
 import org.axsl.foR.fo.PageSequence;
 import org.axsl.foR.fo.SimplePageMaster;
 
@@ -54,4 +55,6 @@
 
     public PageSequence getPageSequence() ;
 
+    public void registerMarker(Marker marker) ;
+
 }

Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-08 17:49:55 UTC (rev 559)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageCollection.java	2006-05-08 18:20:18 UTC (rev 560)
@@ -28,7 +28,7 @@
  * It is the immediate child of {@link AreaTree}, and the parent of one or
  * more Pages.
  */
-public interface PageCollection {
+public interface PageCollection extends AreaNode {
 
     public AreaTree getWritableAreaTree() ;
 

Added: trunk/axsl/axsl-common/src/java/org/axsl/common/OrderedTreeNode.java
===================================================================
--- trunk/axsl/axsl-common/src/java/org/axsl/common/OrderedTreeNode.java	                        (rev 0)
+++ trunk/axsl/axsl-common/src/java/org/axsl/common/OrderedTreeNode.java	2006-05-08 18:20:18 UTC (rev 560)
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ * 
+ */
+
+/* $Id$ */
+
+package org.axsl.common;
+
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
+
+public interface OrderedTreeNode extends TreeNode {
+
+    public Enumeration children() ;
+
+    public List getChildren();
+
+    public boolean getAllowsChildren();
+
+    public TreeNode getChildAt(int childIndex) ;
+
+    public int getChildCount() ;
+
+    public int getIndex(TreeNode node) ;
+
+    public TreeNode getParent() ;
+
+    public boolean isLeaf() ;
+
+    public List getSiblings() ;
+
+    /**
+     * @return The index to "this" in the parent's children.
+     */
+    public int siblingIndex() ;
+
+    /**
+     * @return Return the sibling immediately preceding "this" in the parent's
+     * children, or null if this is the first child.
+     */
+    public OrderedTreeNode getPreviousSibling() ;
+
+    /**
+     * @return Return the sibling immediately following "this" in the parent's
+     * children, or null if this is the last child.
+     */
+    public OrderedTreeNode getNextSibling() ;
+
+    /**
+     * @return True if this AreaNode has any children, false if it has none.
+     */
+    public boolean hasChildren() ;
+
+    public OrderedTreeNode getFirstChild() ;
+
+    public OrderedTreeNode getLastChild() ;
+
+    /**
+     * Returns the next node in the tree relative to the current node, in
+     * pre-order traversal order. This is also known as breadth-first order.
+     * @return The next pre-order node, or null if there is none.
+     */
+    public OrderedTreeNode nextPreOrderNode() ;
+
+    /**
+     * Finds and returns the first leaf that is a descendant of this node --
+     * either this node or its first child's first leaf.
+     * Returns this node if it is a leaf.
+     * (Liberated from {@link DefaultMutableTreeNode}).
+     *
+     * @see #isLeaf
+     * @see DefaultMutableTreeNode#isNodeDescendant
+     * @return  the first leaf in the subtree rooted at this node
+     */
+    public OrderedTreeNode getFirstLeaf() ;
+
+
+    /**
+     * Finds and returns the last leaf that is a descendant of this node --
+     * either this node or its last child's last leaf. 
+     * Returns this node if it is a leaf.
+     * (Liberated from {@link DefaultMutableTreeNode}).
+     *
+     * @see #isLeaf
+     * @see DefaultMutableTreeNode#isNodeDescendant
+     * @return  the last leaf in the subtree rooted at this node
+     */
+    public OrderedTreeNode getLastLeaf() ;
+
+
+    /**
+     * Returns the leaf after this node or null if this node is the
+     * last leaf in the tree.
+     * <p>
+     * In this implementation of the <code>MutableNode</code> interface,
+     * this operation is very inefficient. In order to determine the
+     * next node, this method first performs a linear search in the 
+     * parent's child-list in order to find the current node. 
+     * <p>
+     * That implementation makes the operation suitable for short
+     * traversals from a known position. But to traverse all of the 
+     * leaves in the tree, you should use <code>depthFirstEnumeration</code>
+     * to enumerate the nodes in the tree and use <code>isLeaf</code>
+     * on each node to determine which are leaves.
+     * (Liberated from {@link DefaultMutableTreeNode}).
+     *
+     * @see DefaultMutableTreeNode#depthFirstEnumeration
+     * @see #isLeaf
+     * @return  returns the next leaf past this node
+     */
+    public OrderedTreeNode getNextLeaf() ;
+
+
+    /**
+     * Returns the leaf before this node or null if this node is the
+     * first leaf in the tree.
+     * <p>
+     * In this implementation of the <code>MutableNode</code> interface,
+     * this operation is very inefficient. In order to determine the
+     * previous node, this method first performs a linear search in the 
+     * parent's child-list in order to find the current node. 
+     * <p>
+     * That implementation makes the operation suitable for short
+     * traversals from a known position. But to traverse all of the 
+     * leaves in the tree, you should use <code>depthFirstEnumeration</code>
+     * to enumerate the nodes in the tree and use <code>isLeaf</code>
+     * on each node to determine which are leaves.
+     * (Liberated from {@link DefaultMutableTreeNode}).
+     *
+     * @see     DefaultMutableTreeNode#depthFirstEnumeration
+     * @see     #isLeaf
+     * @return  returns the leaf before this node
+     */
+    public OrderedTreeNode getPreviousLeaf() ;
+
+}


Property changes on: trunk/axsl/axsl-common/src/java/org/axsl/common/OrderedTreeNode.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [558] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java

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

Revision: 558
Author:   victormote
Date:     2006-05-08 10:40:57 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=558&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 17:28:00 UTC (rev 557)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/NormalBlockArea.java	2006-05-08 17:40:57 UTC (rev 558)
@@ -22,6 +22,8 @@
 
 import org.axsl.foR.fo.FootnoteBody;
 
+import java.util.List;
+
 public interface NormalBlockArea extends BlockArea {
 
     /**
@@ -46,4 +48,8 @@
 
     public void addFootnote(FootnoteBody fb) ;
 
+    public List getPendingFootnotes() ;
+
+    public void setPendingFootnotes(List newFootnotes) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [538] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java

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

Revision: 538
Author:   victormote
Date:     2006-05-07 16:15:26 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=538&view=rev

Log Message:
-----------
Add some useful methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 22:51:07 UTC (rev 537)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/PageArea.java	2006-05-07 23:15:26 UTC (rev 538)
@@ -20,8 +20,11 @@
 
 package org.axsl.areaW;
 
+import org.axsl.foR.fo.FootnoteBody;
 import org.axsl.foR.fo.SimplePageMaster;
 
+import java.util.List;
+
 public interface PageArea {
 
     public PageCollection getWritablePageCollection() ;
@@ -38,4 +41,10 @@
 
     public int getNumber() ;
 
+    public void addPendingFootnote(FootnoteBody fb);
+
+    public List getPendingFootnotes() ;
+
+    public void setPendingFootnotes(List footnotes) ;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [522] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java

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

Revision: 522
Author:   victormote
Date:     2006-05-06 17:09:09 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=522&view=rev

Log Message:
-----------
Add LayoutStrategy interface.

Added Paths:
-----------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
Added: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	                        (rev 0)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 00:09:09 UTC (rev 522)
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2006 The aXSL Project.
+ *      http://www.axsl.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.
+ *
+ */
+
+/* $Id$ */
+
+package org.axsl.areaW;
+
+public interface LayoutStrategy {
+
+}


Property changes on: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
___________________________________________________________________
Name: svn:keywords
   + "Author Id Rev Date URL"
Name: svn:eol-style
   + native


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

[aXSL-commit] SF.net SVN: axsl: [533] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java

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

Revision: 533
Author:   victormote
Date:     2006-05-07 15:07:24 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=533&view=rev

Log Message:
-----------
Add method.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 21:05:08 UTC (rev 532)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/LayoutStrategy.java	2006-05-07 22:07:24 UTC (rev 533)
@@ -37,4 +37,6 @@
     public void formatPageSequence(PageCollection pageCollection)
             throws AreaWException ;
 
+    public void formatStaticContent(PageArea pageArea) throws AreaWException;
+
 }


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

[aXSL-commit] SF.net SVN: axsl: [545] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java

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

Revision: 545
Author:   victormote
Date:     2006-05-07 17:08:17 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=545&view=rev

Log Message:
-----------
Make room for other similar methods.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	2006-05-08 00:05:00 UTC (rev 544)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/RegionRABody.java	2006-05-08 00:08:17 UTC (rev 545)
@@ -24,7 +24,7 @@
 
     public MainRA getWritableMainRA() ;
 
-    public FootnoteRA getFootnoteReferenceArea() ;
+    public FootnoteRA getWritableFootnoteReferenceArea() ;
 
     public PageArea getWritablePage() ;
 


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

[aXSL-commit] SF.net SVN: axsl: [546] trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java

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

Revision: 546
Author:   victormote
Date:     2006-05-08 06:59:07 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/axsl/?rev=546&view=rev

Log Message:
-----------
Add needed method.

Modified Paths:
--------------
    trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
Modified: trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java
===================================================================
--- trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 00:08:17 UTC (rev 545)
+++ trunk/axsl/axsl-area-w/src/java/org/axsl/areaW/AreaNode.java	2006-05-08 13:59:07 UTC (rev 546)
@@ -21,6 +21,7 @@
 package org.axsl.areaW;
 
 import org.axsl.foR.FONode;
+import org.axsl.foR.FObj;
 
 public interface AreaNode {
 
@@ -43,4 +44,6 @@
 
     public PageArea getWritablePage() ;
 
+    public FObj traitGeneratedBy() ;
+
 }


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