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

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

Revision: 10066
          http://svn.sourceforge.net/foray/?rev=10066&view=rev
Author:   victormote
Date:     2007-07-20 10:25:25 -0700 (Fri, 20 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/Area.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

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-20 17:08:14 UTC (rev 10065)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-20 17:25:25 UTC (rev 10066)
@@ -42,6 +42,7 @@
 import org.axsl.fo.FoContext;
 import org.axsl.fo.fo.BasicLink;
 import org.axsl.fo.fo.Block;
+import org.axsl.fo.fo.prop.IdPa;
 import org.axsl.font.FontUse;
 import org.axsl.galley.BackgroundArea;
 
@@ -1025,7 +1026,11 @@
      * {@inheritDoc}
      */
     public String traitId() {
-        return traitGeneratedBy().traitId();
+        final Fo generatedBy = this.traitGeneratedBy();
+        if (generatedBy instanceof IdPa) {
+            return ((IdPa) generatedBy).traitId();
+        }
+        return null;
     }
 
     /**

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-20 17:08:14 UTC (rev 10065)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-20 17:25:25 UTC (rev 10066)
@@ -144,6 +144,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.IdPa;
 import org.axsl.fo.fo.prop.InlineProgressionDimensionPa;
 import org.axsl.fo.fo.prop.InternalDestinationPa;
 import org.axsl.fo.fo.prop.KeepTogetherPa;
@@ -214,7 +215,7 @@
         CaseNamePa, CaseTitlePa, CharacterPa, ClearPa, ClipPa, ColorPa,
         ColorProfileNamePa, ColumnCountPa, ColumnGapPa, ContentTypePa,
         DirectionPa, DisplayAlignPa, DominantBaselinePa, EmptyCellsPa, ExtentPa,
-        ExternalDestinationPa, FloatPa, FlowNamePa, GlyphOrientationPa,
+        ExternalDestinationPa, FloatPa, FlowNamePa, GlyphOrientationPa, IdPa,
         InlineProgressionDimensionPa,
         InternalDestinationPa, KeepTogetherPa, KeepWithPa, LeaderPa,
         LineHeightPa, ListBlockPa,


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