From 57f966391e319199be89243e068acacf8f11b668 Mon Sep 17 00:00:00 2001 From: Ariel Coppes Date: Wed, 28 Sep 2011 16:37:10 -0300 Subject: [PATCH] removed componentsengine module forever (I will miss you buddy) --- .gitignore | 5 -- animation4j-componentsengine/pom.xml | 54 ------------- .../UpdateTimeProviderComponent.java | 30 -------- .../properties/DelayedProperty.java | 45 ----------- .../properties/InterpolatedProperty.java | 31 -------- .../sync/PropertiesHolderSynchronizer.java | 26 ------- .../properties/DelayedPropertyTest.java | 76 ------------------- .../PropertiesHolderSynchronizerTest.java | 36 --------- pom.xml | 1 - 9 files changed, 304 deletions(-) delete mode 100644 animation4j-componentsengine/pom.xml delete mode 100644 animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/components/UpdateTimeProviderComponent.java delete mode 100644 animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/DelayedProperty.java delete mode 100644 animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/InterpolatedProperty.java delete mode 100644 animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizer.java delete mode 100644 animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/properties/DelayedPropertyTest.java delete mode 100644 animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizerTest.java diff --git a/.gitignore b/.gitignore index 73b9ce5..7a7da8e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,6 @@ animation4j-core/.settings animation4j-core/.project animation4j-core/target -animation4j-componentsengine/.classpath -animation4j-componentsengine/.settings -animation4j-componentsengine/.project -animation4j-componentsengine/target - animation4j-examples/.classpath animation4j-examples/.settings animation4j-examples/.project diff --git a/animation4j-componentsengine/pom.xml b/animation4j-componentsengine/pom.xml deleted file mode 100644 index 09fe87f..0000000 --- a/animation4j-componentsengine/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - 4.0.0 - - com.gemserk.animation4j - animation4j - 0.0.14-SNAPSHOT - - com.gemserk.animation4j - animation4j-componentsengine - Components Engine module of animation4j - 0.0.14-SNAPSHOT - jar - This module contains classes to use with componentsengine for easy use of animation4j. - - - - - maven-deploy-plugin - 2.5 - - true - - - - - - - - junit - junit - test - - - org.easymock - easymock - test - - - org.easymock - easymockclassextension - test - - - ${project.groupId} - animation4j-core - - - com.gemserk.componentsengine - core - ${componentsengine.version} - - - diff --git a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/components/UpdateTimeProviderComponent.java b/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/components/UpdateTimeProviderComponent.java deleted file mode 100644 index f31fc78..0000000 --- a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/components/UpdateTimeProviderComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gemserk.animation4j.componentsengine.components; - -import com.gemserk.animation4j.time.UpdateableTimeProvider; -import com.gemserk.componentsengine.components.ReferencePropertyComponent; -import com.gemserk.componentsengine.components.annotations.EntityProperty; -import com.gemserk.componentsengine.components.annotations.Handles; -import com.gemserk.componentsengine.messages.Message; -import com.gemserk.componentsengine.properties.Properties; -import com.gemserk.componentsengine.properties.Property; - -/** - * Component to update an UpdateableTimeProvider by handle update message. - * @author acoppes - */ -public class UpdateTimeProviderComponent extends ReferencePropertyComponent { - - @EntityProperty - Property timeProvider; - - public UpdateTimeProviderComponent(String id) { - super(id); - } - - @Handles - public void update(Message message) { - Integer delta = Properties.getValue(message, "delta"); - timeProvider.get().update(delta); - } - -} \ No newline at end of file diff --git a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/DelayedProperty.java b/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/DelayedProperty.java deleted file mode 100644 index 82150f4..0000000 --- a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/DelayedProperty.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gemserk.animation4j.componentsengine.properties; - -import com.gemserk.animation4j.time.TimeProvider; -import com.gemserk.componentsengine.properties.Property; - -/** - * Delays the value set a delay time specified on construction time. Could be an InterpolatedProprety with a custom interpolator too. - */ -public class DelayedProperty implements Property { - - private final int delay; - - private final TimeProvider timeProvider; - - private T delayedValue; - - private float timeWhenSet = 0; - - private T value; - - public DelayedProperty(T value, int delay, TimeProvider timeProvider) { - this.value = value; - this.delay = delay; - this.timeProvider = timeProvider; - } - - boolean updated = false; - - @Override - public T get() { - if (timeProvider.getTime() - timeWhenSet >= delay && !updated) { - value = delayedValue; - updated = true; - } - return value; - } - - @Override - public void set(T value) { - delayedValue = value; - timeWhenSet = timeProvider.getTime(); - updated = false; - } - -} \ No newline at end of file diff --git a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/InterpolatedProperty.java b/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/InterpolatedProperty.java deleted file mode 100644 index b1f769b..0000000 --- a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/properties/InterpolatedProperty.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gemserk.animation4j.componentsengine.properties; - -import com.gemserk.animation4j.transitions.Transition; -import com.gemserk.componentsengine.properties.Property; - -/** - * Provides an implementation of Property which interpolates between the current value and the value you set when you call set(...) method. - * @param - The type of the property value. - * @author acoppes - */ -public class InterpolatedProperty implements Property { - - private final Transition transition; - - /** - * @param transition - The transition to be used to set and get values for the property. To be used probably with an AutoUpdateableTransition to simplify usage. - */ - public InterpolatedProperty(Transition transition) { - this.transition = transition; - } - - @Override - public T get() { - return transition.get(); - } - - @Override - public void set(T value) { - transition.set(value); - } -} \ No newline at end of file diff --git a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizer.java b/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizer.java deleted file mode 100644 index 5db9da6..0000000 --- a/animation4j-componentsengine/src/main/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizer.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gemserk.animation4j.componentsengine.timeline.sync; - -import com.gemserk.animation4j.timeline.sync.ObjectSynchronizer; -import com.gemserk.componentsengine.properties.PropertiesHolder; -import com.gemserk.componentsengine.properties.Property; - -/** - * PropertiesHolder implementation of the ObjectSynchronier, setting values to the PropetiesHolder properties. - * @author acoppes - */ -public class PropertiesHolderSynchronizer implements ObjectSynchronizer { - - private final PropertiesHolder propertiesHolder; - - public PropertiesHolderSynchronizer(PropertiesHolder propertiesHolder) { - this.propertiesHolder = propertiesHolder; - } - - @Override - public void setValue(Object object, String name, Object value) { - Property property = propertiesHolder.getProperty(name); - if (property != null) - property.set(value); - } - -} diff --git a/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/properties/DelayedPropertyTest.java b/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/properties/DelayedPropertyTest.java deleted file mode 100644 index 9ddc2b6..0000000 --- a/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/properties/DelayedPropertyTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.gemserk.animation4j.componentsengine.properties; - -import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.*; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import com.gemserk.animation4j.time.TimeProvider; -import com.gemserk.animation4j.time.UpdateableTimeProvider; -import com.gemserk.componentsengine.properties.Property; - - -public class DelayedPropertyTest { - - @Test - public void shouldReturnOriginalValue() { - TimeProvider timeProvider = createMock(TimeProvider.class); - Property delayedProperty = new DelayedProperty(100, 1000, timeProvider); - assertEquals(100, delayedProperty.get().intValue()); - } - - @Test - public void shouldReturnStartValueWhileBeforeDelay() { - TimeProvider timeProvider = createMock(TimeProvider.class); - - expect(timeProvider.getTime()).andReturn(0f); - expect(timeProvider.getTime()).andReturn(0f); - replay(timeProvider); - - Property delayedProperty = new DelayedProperty(100, 1000, timeProvider); - delayedProperty.set(200); - assertEquals(100, delayedProperty.get().intValue()); - - verify(timeProvider); - } - - @Test - public void shouldReturnNewValueAfterDelay() { - TimeProvider timeProvider = createMock(TimeProvider.class); - - expect(timeProvider.getTime()).andReturn(0f); - expect(timeProvider.getTime()).andReturn(1000f); - replay(timeProvider); - - Property delayedProperty = new DelayedProperty(100, 1000, timeProvider); - delayedProperty.set(200); - assertEquals(200, delayedProperty.get().intValue()); - - verify(timeProvider); - } - - @Test - public void useTest() { - UpdateableTimeProvider timeProvider = new UpdateableTimeProvider(); - - Property delayedProperty = new DelayedProperty(100, 1000, timeProvider); - assertEquals(100, delayedProperty.get().intValue()); - - delayedProperty.set(200); - - timeProvider.update(100); - assertEquals(100, delayedProperty.get().intValue()); - timeProvider.update(900); - assertEquals(200, delayedProperty.get().intValue()); - - delayedProperty.set(100); - assertEquals(200, delayedProperty.get().intValue()); - timeProvider.update(999); - assertEquals(200, delayedProperty.get().intValue()); - timeProvider.update(1); - assertEquals(100, delayedProperty.get().intValue()); - - } - -} diff --git a/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizerTest.java b/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizerTest.java deleted file mode 100644 index 0b58cd8..0000000 --- a/animation4j-componentsengine/src/test/java/com/gemserk/animation4j/componentsengine/timeline/sync/PropertiesHolderSynchronizerTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.gemserk.animation4j.componentsengine.timeline.sync; - -import static org.junit.Assert.assertThat; - -import java.util.HashMap; - -import org.hamcrest.core.IsEqual; -import org.junit.Test; - -import com.gemserk.componentsengine.properties.PropertiesHolderImpl; -import com.gemserk.componentsengine.properties.Property; -import com.gemserk.componentsengine.properties.SimpleProperty; - - -public class PropertiesHolderSynchronizerTest { - - @Test - public void shouldSetValuesForProperties() { - - HashMap> properties = new HashMap>(); - PropertiesHolderImpl propertiesHolder = new PropertiesHolderImpl(properties); - - propertiesHolder.addProperty("x", new SimpleProperty(100f)); - - PropertiesHolderSynchronizer propertiesHolderSynchronizer = new PropertiesHolderSynchronizer(propertiesHolder); - - propertiesHolderSynchronizer.setValue(null, "y", 200f); - - assertThat((Float)propertiesHolder.getProperty("x").get(), IsEqual.equalTo(100f)); - - propertiesHolderSynchronizer.setValue(null, "x", 200f); - - assertThat((Float)propertiesHolder.getProperty("x").get(), IsEqual.equalTo(200f)); - } - -} diff --git a/pom.xml b/pom.xml index 9c5b35d..8cf90d1 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,6 @@ animation4j-core - animation4j-componentsengine animation4j-examples animation4j-java2d animation4j-slick