You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2011/06/02 19:32:16 UTC
svn commit: r1130673 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
wtk/src/org/apache/pivot/wtk/effects/Transition.java
Author: gbrown
Date: Thu Jun 2 17:32:15 2011
New Revision: 1130673
URL: http://svn.apache.org/viewvc?rev=1130673&view=rev
Log:
Resolve PIVOT-749.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java?rev=1130673&r1=1130672&r2=1130673&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSheetSkin.java Thu Jun 2 17:32:15 2011
@@ -640,10 +640,7 @@ public class TerraSheetSkin extends Wind
openTransition.start(transitionListener);
} else {
// Reverse the open transition
- if (!openTransition.isReversed()
- && openTransition.isRunning()) {
- openTransition.reverse(transitionListener);
- }
+ openTransition.reverse();
}
vote = (openTransition != null
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java?rev=1130673&r1=1130672&r2=1130673&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/Transition.java Thu Jun 2 17:32:15 2011
@@ -329,43 +329,35 @@ public abstract class Transition {
}
/**
- * Reverses the transition with no listener.
+ * Tests whether the transition is reversed.
*
- * @see #reverse(TransitionListener)
+ * @return
+ * <tt>true</tt> if the transition is reversed; <tt>false</tt>, otherwise.
*/
- public void reverse() {
- reverse(null);
+ public boolean isReversed() {
+ return reversed;
}
/**
- * Reverses the transition. Updates the start time so the reverse duration
- * is the same as the current elapsed time.
+ * Sets the transition's reversed flag.
*
- * @param transitionListener
- * The listener to get notified when the transition completes, or
- * <tt>null</tt> if no notification is necessary
+ * @param reversed
*/
- public void reverse(TransitionListener transitionListener) {
- if (this.transitionCallback == null) {
- throw new IllegalStateException("Transition is not currently running.");
- }
-
- this.transitionListener = transitionListener;
-
- long repeatDuration = currentTime - startTime;
- long endTime = currentTime + repeatDuration;
- startTime = endTime - duration;
-
- reversed = !reversed;
+ public void setReversed(boolean reversed) {
+ this.reversed = reversed;
}
/**
- * Tests whether the transition is reversed.
- *
- * @return
- * <tt>true</tt> if the transition is reversed; <tt>false</tt>, otherwise.
+ * Reverses the transition. If the transition is running, updates the start
+ * time so the reverse duration is the same as the current elapsed time.
*/
- public boolean isReversed() {
- return reversed;
+ public void reverse() {
+ if (isRunning()) {
+ long repeatDuration = currentTime - startTime;
+ long endTime = currentTime + repeatDuration;
+ startTime = endTime - duration;
+ }
+
+ setReversed(!isReversed());
}
}