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

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

Revision: 7888
          http://svn.sourceforge.net/foray/?rev=7888&view=rev
Author:   victormote
Date:     2006-09-04 13:26:51 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Conform to axsl changes: Roll a play-during method up into special return values of another method.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 20:02:18 UTC (rev 7887)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 20:26:51 UTC (rev 7888)
@@ -2300,13 +2300,6 @@
     /**
      * {@inheritDoc}
      */
-    public boolean traitPlayDuringAuto() {
-        return propertyList.traitPlayDuringAuto();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public String[] traitVoiceFamily(final FOContext context) {
         return propertyList.getVoiceFamily(context);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 20:02:18 UTC (rev 7887)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 20:26:51 UTC (rev 7888)
@@ -3053,15 +3053,6 @@
         return PlayDuring.getRepeatNoInstance();
     }
 
-    public boolean traitPlayDuringAuto() {
-        final PlayDuring property = (PlayDuring) getProperty(Constants
-                .FOPROP_PLAY_DURING);
-        if (property != null) {
-            return property.getAuto();
-        }
-        return PlayDuring.getAutoNoInstance();
-    }
-
     public String[] getVoiceFamily(final FOContext context) {
         final VoiceFamily property = (VoiceFamily) getProperty(Constants
                 .FOPROP_VOICE_FAMILY);

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java	2006-09-04 20:02:18 UTC (rev 7887)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java	2006-09-04 20:26:51 UTC (rev 7888)
@@ -99,7 +99,7 @@
                 return "";
             }
             case Constants.FOVAL_NONE: {
-                return "";
+                return null;
             }
             }
         }
@@ -107,12 +107,7 @@
     }
 
     public static String getValueNoInstance() {
-        /*
-         * This is a little odd. The initial value is "auto", which implies
-         * some things about any parent sounds that are already playing.
-         * However, the play-during value itself does not automatically
-         * inherit.
-         */
+        /* A return value of "" implies "auto" the default. */
         return "";
     }
 
@@ -122,7 +117,7 @@
         if (parent != null) {
             return fobj.traitPlayDuring(context);
         }
-        return "";
+        return PlayDuring.getValueNoInstance();
     }
 
     public boolean getMix() {
@@ -141,20 +136,6 @@
         return false;
     }
 
-    public boolean getAuto() {
-        if (this.value instanceof PropertyKeyword) {
-            final short keyword = ((PropertyKeyword) this.value).getValue();
-            if (keyword == Constants.FOVAL_AUTO) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean getAutoNoInstance() {
-        return true;
-    }
-
     protected short[] getValidKeywords() {
         return validKeywords;
     }


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