svn commit: r486505 - in /xmlgraphics/batik/trunk/sources/org/apache/batik: anim/timing/TimedElement.java css/engine/CSSEngine.java dom/util/DoublyIndexedTable.java

[ca...@apache.org]

Author: cam
Date: Tue Dec 12 21:57:39 2006
New Revision: 486505

URL: http://svn.apache.org/viewvc?view=rev&rev=486505
Log:
1. Fix small problem with animations (they should be exclusive of end time).
2. Small change to handling of override stylesheets in CSSEngine--sometimes
   removing a property did not notify the bridge.

Modified:
    xmlgraphics/batik/trunk/sources/org/apache/batik/anim/timing/TimedElement.java
    xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/CSSEngine.java
    xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/DoublyIndexedTable.java

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/timing/TimedElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/timing/TimedElement.java?view=diff&rev=486505&r1=486504&r2=486505
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/timing/TimedElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/timing/TimedElement.java Tue Dec 12 21:57:39 2006
@@ -534,27 +534,19 @@
         while (i.hasNext()) {
             TimingSpecifier ts = (TimingSpecifier) i.next();
             // Trace.print(ts.owner + "'s " + (ts.isBegin ? "begin" : "end" ) + ": " + ts);
-            // if (root.shouldPropagate(interval, ts, true)) {
-                float t = ts.newInterval(interval);
-                if (t < dependentMinTime) {
-                    dependentMinTime = t;
-                }
-            // } else {
-            //     // Trace.print("(but not propagating)");
-            // }
+            float t = ts.newInterval(interval);
+            if (t < dependentMinTime) {
+                dependentMinTime = t;
+            }
         }
         i = endDependents.iterator();
         while (i.hasNext()) {
             TimingSpecifier ts = (TimingSpecifier) i.next();
             // Trace.print(ts.owner + "'s " + (ts.isBegin ? "begin" : "end" ) + ": " + ts);
-            // if (root.shouldPropagate(interval, ts, false)) {
-            // } else {
-                float t = ts.newInterval(interval);
-                if (t < dependentMinTime) {
-                    dependentMinTime = t;
-                }
-            //     // Trace.print("(but not propagating)");
-            // }
+            float t = ts.newInterval(interval);
+            if (t < dependentMinTime) {
+                dependentMinTime = t;
+            }
         }
         return dependentMinTime;
         // } finally { Trace.exit(); }
@@ -663,7 +655,7 @@
         // begin and end times, or end the current interval and compute
         // a new one.
         boolean hasEnded = currentInterval != null
-            && time > currentInterval.getEnd();
+            && time >= currentInterval.getEnd();
         // Fire any repeat events that should have been fired since the
         // last sample.
         if (currentInterval != null && time >= currentInterval.getBegin()) {

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/CSSEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/CSSEngine.java?view=diff&rev=486505&r1=486504&r2=486505
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/CSSEngine.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/CSSEngine.java Tue Dec 12 21:57:39 2006
@@ -2534,7 +2534,7 @@
                     StyleMap style = elt.getComputedStyleMap(null);
                     if (style != null
                             && style.getOrigin(idx) == StyleMap.OVERRIDE_ORIGIN
-                            && style.isComputed(idx)) {
+                            /* && style.isComputed(idx) */) {
                         invalidateProperties
                             (elt, new int[] { idx }, null, true);
                     }

Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/DoublyIndexedTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/DoublyIndexedTable.java?view=diff&rev=486505&r1=486504&r2=486505
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/DoublyIndexedTable.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/DoublyIndexedTable.java Tue Dec 12 21:57:39 2006
@@ -1,11 +1,11 @@
 /*
 
    Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0