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

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

Revision: 10056
          http://svn.sourceforge.net/foray/?rev=10056&view=rev
Author:   victormote
Date:     2007-07-19 16:31:16 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Conform to axsl changes moving methods from Fo to new property-specific interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTablePartContainer.java
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
    trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTablePartContainer.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTablePartContainer.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -188,4 +188,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -647,30 +647,6 @@
     public abstract int traitSpaceEndOptimum();
 
     /**
-     * Return the minimum IP dimension for this area.
-     * @return The minimum IP dimension for this area, or -1 for "auto".
-     */
-    public int traitIPDimensionMin() {
-        return traitGeneratedBy().traitIpDimensionMin(this);
-    }
-
-    /**
-     * Return the optimum IP dimension for this area.
-     * @return The optimum IP dimension for this area, or -1 for "auto".
-     */
-    public int traitIPDimensionOpt() {
-        return traitGeneratedBy().traitIpDimensionOpt(this);
-    }
-
-    /**
-     * Return the maximum IP dimension for this area.
-     * @return The maximim IP dimension for this area, or -1 for "auto".
-     */
-    public int traitIPDimensionMax() {
-        return traitGeneratedBy().traitIpDimensionMax(this);
-    }
-
-    /**
      * Tells which axis (horizontal or vertical) is the block-progression axis.
      * @return Either {@link AbsoluteAxis#HORIZONTAL} or
      * {@link AbsoluteAxis#VERTICAL}, or null if writing-mode is invalid.

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -323,4 +323,10 @@
         return offset;
     }
 
+    /**
+     * Return the optimum IP dimension for this area.
+     * @return The optimum IP dimension for this area, or -1 for "auto".
+     */
+    public abstract int traitIPDimensionOpt();
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -513,4 +513,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -352,4 +352,11 @@
         return this.traitGeneratedBy().traitBpDimensionOpt(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -364,4 +364,11 @@
         return this.traitGeneratedBy().traitBpDimensionOpt(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -494,4 +494,11 @@
         return this.traitGeneratedBy().traitBpDimensionOpt(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -341,4 +341,11 @@
         return this.traitGeneratedBy().traitBpDimensionOpt(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -725,4 +725,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -1419,4 +1419,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -311,4 +311,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -390,4 +390,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -510,4 +510,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -404,4 +404,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -346,4 +346,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -375,4 +375,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -561,4 +561,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -717,4 +717,11 @@
         return this.traitGeneratedBy().traitDisplayAlign(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return traitGeneratedBy().traitIpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -858,4 +858,11 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -379,4 +379,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -980,4 +980,11 @@
         return 0;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int traitIPDimensionOpt() {
+        return -1;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 23:06:07 UTC (rev 10055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 23:31:16 UTC (rev 10056)
@@ -142,6 +142,7 @@
 import org.axsl.fo.fo.prop.FloatPa;
 import org.axsl.fo.fo.prop.FlowNamePa;
 import org.axsl.fo.fo.prop.GlyphOrientationPa;
+import org.axsl.fo.fo.prop.InlineProgressionDimensionPa;
 import org.axsl.fo.fo.prop.InternalDestinationPa;
 import org.axsl.fo.fo.prop.KeepTogetherPa;
 import org.axsl.fo.fo.prop.KeepWithPa;
@@ -208,6 +209,7 @@
         ColorProfileNamePa, ColumnCountPa, ColumnGapPa, ContentTypePa,
         DirectionPa, DisplayAlignPa, DominantBaselinePa, EmptyCellsPa, ExtentPa,
         ExternalDestinationPa, FloatPa, FlowNamePa, GlyphOrientationPa,
+        InlineProgressionDimensionPa,
         InternalDestinationPa, KeepTogetherPa, KeepWithPa, LeaderPa,
         LineHeightPa, ListBlockPa,
         MediaUsagePa, NumberColumnsRepeatedPa, OverflowPa, PageDimensionPa,


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