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/01/11 14:49:11 UTC
svn commit: r1057628 - in /pivot/branches/3.x:
core/src/org/apache/pivot/util/ core/test/org/apache/pivot/csv/test/
scene/src/org/apache/pivot/scene/ scene/src/org/apache/pivot/scene/animation/
ui/test/org/apache/pivot/ui/test/ web/src/org/apache/pivot...
Author: gbrown
Date: Tue Jan 11 13:49:10 2011
New Revision: 1057628
URL: http://svn.apache.org/viewvc?rev=1057628&view=rev
Log:
Add missing @Override annotations.
Modified:
pivot/branches/3.x/core/src/org/apache/pivot/util/ListenerList.java
pivot/branches/3.x/core/src/org/apache/pivot/util/ObservableSet.java
pivot/branches/3.x/core/test/org/apache/pivot/csv/test/CSVSerializerTest.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/NodeClassListener.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CircularEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CubicEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/ExponentialEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/LinearEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuadraticEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuarticEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuinticEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/SineEasing.java
pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/Transition.java
pivot/branches/3.x/ui/test/org/apache/pivot/ui/test/StageTest.java
pivot/branches/3.x/web/src/org/apache/pivot/web/QueryProperties.java
Modified: pivot/branches/3.x/core/src/org/apache/pivot/util/ListenerList.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/core/src/org/apache/pivot/util/ListenerList.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/core/src/org/apache/pivot/util/ListenerList.java (original)
+++ pivot/branches/3.x/core/src/org/apache/pivot/util/ListenerList.java Tue Jan 11 13:49:10 2011
@@ -72,6 +72,7 @@ public abstract class ListenerList<T> {
private Node first = null;
private Iterable<T> iterable = new Iterable<T>() {
+ @Override
public Iterator<T> iterator() {
return new NodeIterator();
}
Modified: pivot/branches/3.x/core/src/org/apache/pivot/util/ObservableSet.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/core/src/org/apache/pivot/util/ObservableSet.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/core/src/org/apache/pivot/util/ObservableSet.java (original)
+++ pivot/branches/3.x/core/src/org/apache/pivot/util/ObservableSet.java Tue Jan 11 13:49:10 2011
@@ -28,12 +28,14 @@ public interface ObservableSet<E> extend
public static class ObservableSetListenerList<E>
extends ListenerList<ObservableSetListener<E>>
implements ObservableSetListener<E> {
+ @Override
public void elementAdded(ObservableSet<E> set, E element) {
for (ObservableSetListener<E> listener : listeners()) {
listener.elementAdded(set, element);
}
}
+ @Override
public void elementRemoved(ObservableSet<E> set, Object element) {
for (ObservableSetListener<E> listener : listeners()) {
listener.elementRemoved(set, element);
Modified: pivot/branches/3.x/core/test/org/apache/pivot/csv/test/CSVSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/core/test/org/apache/pivot/csv/test/CSVSerializerTest.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/core/test/org/apache/pivot/csv/test/CSVSerializerTest.java (original)
+++ pivot/branches/3.x/core/test/org/apache/pivot/csv/test/CSVSerializerTest.java Tue Jan 11 13:49:10 2011
@@ -47,14 +47,17 @@ public class CSVSerializerTest {
CSVSerializer serializer = new CSVSerializer();
serializer.setKeys("A", "B", "C");
serializer.getCSVSerializerListeners().add(new CSVSerializerListener() {
+ @Override
public void beginList(CSVSerializer csvSerializer, List<?> list) {
System.out.println("Begin list: " + list);
}
+ @Override
public void endList(CSVSerializer csvSerializer) {
System.out.println("End list");
}
+ @Override
public void readItem(CSVSerializer csvSerializer, Object item) {
System.out.println("Read item: " + item);
}
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/NodeClassListener.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/NodeClassListener.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/NodeClassListener.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/NodeClassListener.java Tue Jan 11 13:49:10 2011
@@ -24,6 +24,7 @@ public interface NodeClassListener {
* Node class listener adapter.
*/
public static class Adapter implements NodeClassListener {
+ @Override
public void focusedNodeChanged(Node previousFocusedNode) {
}
}
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CircularEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CircularEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CircularEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CircularEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Circular easing operation.
*/
public class CircularEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return -change * ((float)Math.sqrt(1f - (time /= duration) * time) - 1f) + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return change * (float)Math.sqrt(1f - (time = time / duration - 1f) * time) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if ((time /= duration / 2f) < 1f) {
return -change / 2f * ((float)Math.sqrt(1f - time * time) - 1f) + begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CubicEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CubicEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CubicEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/CubicEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Cubic easing operation.
*/
public class CubicEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return change * (time /= duration) * time * time + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return change * ((time = time / duration - 1f) * time * time + 1f) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if ((time /= duration / 2f) < 1f) {
return change / 2f * time * time * time + begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/ExponentialEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/ExponentialEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/ExponentialEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/ExponentialEasing.java Tue Jan 11 13:49:10 2011
@@ -20,16 +20,19 @@ package org.apache.pivot.scene.animation
* Exponential easing operation.
*/
public class ExponentialEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return (time == 0) ? begin
: change * (float)Math.pow(2, 10 * (time / duration - 1f)) + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return (time == duration) ? begin + change
: change * ((float)-Math.pow(2, -10 * time / duration) + 1f) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if (time == 0) {
return begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/LinearEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/LinearEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/LinearEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/LinearEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Linear easing operation.
*/
public class LinearEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return change * time / duration + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return change * time / duration + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
return change * time / duration + begin;
}
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuadraticEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuadraticEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuadraticEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuadraticEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Quadratic easing operation.
*/
public class QuadraticEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return change * (time /= duration) * time + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return -change * (time /= duration) * (time - 2) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if ((time /= duration / 2) < 1) {
return change / 2 * time * time + begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuarticEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuarticEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuarticEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuarticEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Quartic easing operation.
*/
public class QuarticEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return change * (time /= duration) * time * time * time + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return -change * ((time = time / duration - 1) * time * time * time - 1) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if ((time /= duration / 2f) < 1) {
return change / 2f * time * time * time * time + begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuinticEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuinticEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuinticEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/QuinticEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Quintic easing operation.
*/
public class QuinticEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return change * (time /= duration) * time * time * time * time + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return change * ((time = time / duration - 1) * time * time * time * time + 1) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
if ((time /= duration / 2f) < 1) {
return change / 2f * time * time * time * time * time + begin;
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/SineEasing.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/SineEasing.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/SineEasing.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/SineEasing.java Tue Jan 11 13:49:10 2011
@@ -20,14 +20,17 @@ package org.apache.pivot.scene.animation
* Easing operation based on a sine curve.
*/
public class SineEasing implements Easing {
+ @Override
public float easeIn(float time, float begin, float change, float duration) {
return -change * (float)Math.cos(time / duration * (Math.PI/2)) + change + begin;
}
+ @Override
public float easeOut(float time, float begin, float change, float duration) {
return change * (float)Math.sin(time / duration * (Math.PI/2)) + begin;
}
+ @Override
public float easeInOut(float time, float begin, float change, float duration) {
return -change / 2f * (float)(Math.cos(Math.PI * time / duration) - 1) + begin;
}
Modified: pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/Transition.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/Transition.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/Transition.java (original)
+++ pivot/branches/3.x/scene/src/org/apache/pivot/scene/animation/Transition.java Tue Jan 11 13:49:10 2011
@@ -79,6 +79,7 @@ public class Transition {
this.callback = callback;
}
+ @Override
public void run() {
if (!cancelled) {
try {
Modified: pivot/branches/3.x/ui/test/org/apache/pivot/ui/test/StageTest.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/ui/test/org/apache/pivot/ui/test/StageTest.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/ui/test/org/apache/pivot/ui/test/StageTest.java (original)
+++ pivot/branches/3.x/ui/test/org/apache/pivot/ui/test/StageTest.java Tue Jan 11 13:49:10 2011
@@ -25,14 +25,17 @@ import org.apache.pivot.scene.shape.Rect
import org.apache.pivot.ui.Application;
public class StageTest implements Application {
+ @Override
public String getTitle() {
return null;
}
+ @Override
public List<Image> getIcons() {
return null;
}
+ @Override
public void startup(Stage stage, Map<String, String> properties) throws Exception {
// TODO Rectangles don't have a preferred size; add a group to the stage and
// put the rectangles in it
@@ -41,13 +44,16 @@ public class StageTest implements Applic
stage.getNodes().add(new Rectangle(30, 30, 320, 240));
}
+ @Override
public boolean shutdown(boolean optional) {
return false;
}
+ @Override
public void suspend() {
}
+ @Override
public void resume() {
}
}
Modified: pivot/branches/3.x/web/src/org/apache/pivot/web/QueryProperties.java
URL: http://svn.apache.org/viewvc/pivot/branches/3.x/web/src/org/apache/pivot/web/QueryProperties.java?rev=1057628&r1=1057627&r2=1057628&view=diff
==============================================================================
--- pivot/branches/3.x/web/src/org/apache/pivot/web/QueryProperties.java (original)
+++ pivot/branches/3.x/web/src/org/apache/pivot/web/QueryProperties.java Tue Jan 11 13:49:10 2011
@@ -85,6 +85,7 @@ public final class QueryProperties exten
return new PropertyEntry(key);
}
+ @Override
public void remove() {
if (key == null) {
throw new IllegalStateException();