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

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

Revision: 10002
          http://svn.sourceforge.net/foray/?rev=10002&view=rev
Author:   victormote
Date:     2007-07-16 13:12:22 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
Conform to axsl changes removing the "margin" trait methods.

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-16 19:57:37 UTC (rev 10001)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-16 20:12:22 UTC (rev 10002)
@@ -1079,38 +1079,6 @@
     }
 
     /**
-     * Returns the top margin for this area.
-     * @return The top margin for this area.
-     */
-    public int getMarginTop() {
-        return traitGeneratedBy().getMarginTop(this);
-    }
-
-    /**
-     * Returns the bottom margin for this area.
-     * @return The bottom margin for this area.
-     */
-    public int getMarginBottom() {
-        return traitGeneratedBy().getMarginBottom(this);
-    }
-
-    /**
-     * Returns the left margin for this area.
-     * @return The left margin for this area.
-     */
-    public int getMarginLeft() {
-        return traitGeneratedBy().getMarginLeft(this);
-    }
-
-    /**
-     * Returns the right margin for this area.
-     * @return The right margin for this area.
-     */
-    public int getMarginRight() {
-        return traitGeneratedBy().getMarginRight(this);
-    }
-
-    /**
      * {@inheritDoc}
      */
     public abstract int pdAvailable();

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-16 19:57:37 UTC (rev 10001)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-16 20:12:22 UTC (rev 10002)
@@ -568,28 +568,40 @@
     public abstract Namespace getNamespace();
 
     /**
-     * {@inheritDoc}
+     * Returns the left margin of this object.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The left margin, in millipoints, of this object.
      */
     public int getMarginLeft(final FoContext context) {
         return propertyList.getMarginLeft(this, context);
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the right margin of this object.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The right margin, in millipoints, of this object.
      */
     public int getMarginRight(final FoContext context) {
         return propertyList.getMarginRight(this, context);
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the top margin of this object.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The top margin, in millipoints, of this object.
      */
     public int getMarginTop(final FoContext context) {
         return propertyList.getMarginTop(this, context);
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the bottom margin of this object.
+     * @param context An object that knows how to resolve FO Tree context
+     * issues.
+     * @return The bottom margin, in millipoints, of this object.
      */
     public int getMarginBottom(final FoContext context) {
         return propertyList.getMarginBottom(this, context);


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