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

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

Revision: 12264
          http://sourceforge.net/p/foray/code/12264
Author:   victormote
Date:     2021-12-22 14:02:23 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Change return types for all real number values to "double" for consistency and lowest-common-denominator considerations.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -151,7 +151,6 @@
 
 import java.awt.Color;
 import java.awt.Shape;
-import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -2647,12 +2646,12 @@
     }
 
     @Override
-    public float traitAzimuth(final FoContext context) {
+    public double traitAzimuth(final FoContext context) {
         return getPropertyList().traitAzimuth(this, context);
     }
 
     @Override
-    public float traitElevation(final FoContext context) {
+    public double traitElevation(final FoContext context) {
         return getPropertyList().traitElevation(this, context);
     }
 
@@ -3746,9 +3745,9 @@
     }
 
     @Override
-    public BigDecimal traitIntrinsicScaleValue(final FoContext context) {
+    public double traitIntrinsicScaleValue(final FoContext context) {
         // TODO Auto-generated method stub
-        return null;
+        return 0;
     }
 
     @Override

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -3787,7 +3787,7 @@
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The azimuth property.
      */
-    public float traitAzimuth(final FoObj fobj, final FoContext context) {
+    public double traitAzimuth(final FoObj fobj, final FoContext context) {
         final PdAzimuth property = (PdAzimuth) getProperty(FoProperty.AZIMUTH);
         if (property != null) {
             return property.getValue(context, fobj);
@@ -3801,7 +3801,7 @@
      * @param context An object that knows how to resolve FO Tree context issues.
      * @return The elevation property.
      */
-    public float traitElevation(final FoObj fobj, final FoContext context) {
+    public double traitElevation(final FoObj fobj, final FoContext context) {
         final PdElevation property = (PdElevation) getProperty(FoProperty.ELEVATION);
         if (property != null) {
             return property.getValue(context, fobj);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAzimuth.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -195,7 +195,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The value of this property.
      */
-    public float getValue(final FoContext context, final FoObj fobj) {
+    public double getValue(final FoContext context, final FoObj fobj) {
         if (value() instanceof DtAngle) {
             return ((DtAngle) value()).getValue();
         }
@@ -277,7 +277,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The initial value for this property.
      */
-    public static float getValueNoInstance(final FoContext context,
+    public static double getValueNoInstance(final FoContext context,
             final FoObj fobj) {
         final FoObj parent = fobj.effectiveParent(context);
         if (parent != null) {

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java	2021-12-22 12:42:58 UTC (rev 12263)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdElevation.java	2021-12-22 14:02:23 UTC (rev 12264)
@@ -113,7 +113,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The value of this property.
      */
-    public float getValue(final FoContext context, final FoObj fobj) {
+    public double getValue(final FoContext context, final FoObj fobj) {
         if (value() instanceof DtAngle) {
             return ((DtAngle) value()).getValue();
         }
@@ -156,7 +156,7 @@
      * @param fobj The FO for which this value is needed.
      * @return The initial value for this property.
      */
-    public static float getValueNoInstance(final FoContext context,
+    public static double getValueNoInstance(final FoContext context,
             final FoObj fobj) {
         final FoObj parent = fobj.effectiveParent(context);
         if (parent != null) {

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