CleanupHEADtrunk

2 files changed, 26 insertions, 16 deletions

diff --git a/israfil-foundation-valuemodel/src/main/java/net/israfil/foundation/valuemodel/ValueHolder.java b/israfil-foundation-valuemodel/src/main/java/net/israfil/foundation/valuemodel/ValueHolder.java
index 55f23c3..578ee04 100644
--- a/israfil-foundation-valuemodel/src/main/java/net/israfil/foundation/valuemodel/ValueHolder.java
+++ b/israfil-foundation-valuemodel/src/main/java/net/israfil/foundation/valuemodel/ValueHolder.java
@@ -21,8 +21,8 @@ import net.israfil.foundation.dynamic.DynamicUtil;
 public class ValueHolder<E> implements MutableValue<E> {

 

     private E _value = null;

-    private Map<Integer, ObserverHolder> _observers = new HashMap<Integer, ObserverHolder>();

-    private Map<Integer, VetoerHolder> _vetoers = new HashMap<Integer, VetoerHolder>();

+    private Map<Integer, ObserverHolder> _observers = new HashMap<>();

+    private Map<Integer, VetoerHolder> _vetoers = new HashMap<>();

 

 	public ValueHolder(E o) {

 		set(o); 

@@ -30,11 +30,13 @@ public class ValueHolder<E> implements MutableValue<E> {
         

     protected ValueHolder() { }

 

+	@Override

 	public E get() {

 		return _value;

 	}

 

-    public void set(E newValue) {

+    @Override

+	public void set(E newValue) {

         boolean approved = true;

         E oldValue = _value;

         for (VetoerHolder vetoer : _vetoers.values()) {

@@ -52,6 +54,7 @@ public class ValueHolder<E> implements MutableValue<E> {
 	/**

 	 * @see org.israfil.maveric.Observable#addObserver(java.lang.Object, java.lang.String)

 	 */

+	@Override

 	public void addObservers(String callback, Object ... observers) {

     	for (Object observer : observers) {

     		_observers.put(observer.hashCode(),new ObserverHolder(observer,callback));

@@ -61,6 +64,7 @@ public class ValueHolder<E> implements MutableValue<E> {
 	/**

      * @see org.israfil.maveric.Observable#removeObserver(java.lang.Object)

 	 */

+	@Override

 	public void removeObservers(Object ... observers) {

     	for (Object observer : observers) {

     		_observers.remove(observer.hashCode());

@@ -69,7 +73,8 @@ public class ValueHolder<E> implements MutableValue<E> {
     /**

      * @see org.israfil.maveric.Vetoable#addVetoer(java.lang.Object, java.lang.String)

      */

-    public void addVetoers(String callback, Object ... vetoers) {

+    @Override

+	public void addVetoers(String callback, Object ... vetoers) {

     	for (Object vetoer : vetoers) {

     		_vetoers.put(vetoer.hashCode(),new VetoerHolder(vetoer,callback));

     	}

@@ -78,7 +83,8 @@ public class ValueHolder<E> implements MutableValue<E> {
     /**

      * @see org.israfil.maveric.Vetoable#removeVetoer(java.lang.Object)

      */

-    public void removeVetoers(Object ... vetoers) {

+    @Override

+	public void removeVetoers(Object ... vetoers) {

     	for (Object vetoer : vetoers) {

     		_vetoers.remove(vetoer.hashCode());

     	}

diff --git a/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java b/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
index 271c4a0..57d4d4e 100644
--- a/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
+++ b/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
@@ -33,9 +33,9 @@ public class ValueHolderTest {
 	@BeforeMethod

 	protected void setUp() throws Exception {

         stringValue = "String Value";

-        integerValue = new Integer(5);

-        stringValueHolder = new ValueHolder<String>(stringValue);

-        integerValueHolder = new ValueHolder<Integer>(integerValue);

+        integerValue = Integer.valueOf(5);

+        stringValueHolder = new ValueHolder<>(stringValue);

+        integerValueHolder = new ValueHolder<>(integerValue);

 	}

 

 	@AfterMethod

@@ -51,7 +51,7 @@ public class ValueHolderTest {
 	 */

 	public void testValueHolderObject() {

         String valueString = "Value";

-        ValueHolder<String>valueHolder = new ValueHolder<String>(valueString);

+        ValueHolder<String>valueHolder = new ValueHolder<>(valueString);

         Assert.assertEquals(valueString,valueHolder.get());

 	}

 

@@ -68,14 +68,14 @@ public class ValueHolderTest {
     

     public void testAddObserverObjectString() {

         String stringValue2 = "String Value 2";

-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);

+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);

         stringValueHolder.addObservers("notifyMe:java.lang.Object:java.lang.Object:java.lang.Object",callback);

         stringValueHolder.set(stringValue2);

         Assert.assertTrue(callback.notified);

     }

     public void testRemoveObserverObjectString() {

         String stringValue2 = "String Value 2";

-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);

+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);

         stringValueHolder.addObservers("notifyMe:java.lang.Object:java.lang.Object:java.lang.Object",callback);

         stringValueHolder.removeObservers(callback);

         stringValueHolder.set(stringValue2);

@@ -83,12 +83,12 @@ public class ValueHolderTest {
     } 

     public void testAddApproverObjectString() {

         String stringValue2 = "String Value 2";

-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);

+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);

         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);

         stringValueHolder.set(stringValue2);

         Assert.assertEquals(stringValue2,stringValueHolder.get());

         

-        callback = new CallbackObject<String>(stringValueHolder);

+        callback = new CallbackObject<>(stringValueHolder);

         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);

         stringValueHolder.set(stringValue2);

         stringValueHolder.set(stringValue);

@@ -97,7 +97,7 @@ public class ValueHolderTest {
     }

     public void testRemoveApproverObjectString() {

         String stringValue2 = "String Value 2";

-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);

+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);

         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);

         stringValueHolder.removeVetoers(callback);

         stringValueHolder.set(stringValue2);

@@ -105,7 +105,9 @@ public class ValueHolderTest {
         Assert.assertEquals(stringValue,stringValueHolder.get());

         Assert.assertFalse(stringValue2.equals(stringValueHolder.get()));   

     }

-    public void finalize() throws Throwable {

+    @SuppressWarnings("deprecation")

+	@Override

+	public void finalize() throws Throwable {

         stringValue = null;

         integerValue = null;

         stringValueHolder = null;

@@ -134,7 +136,9 @@ public class ValueHolderTest {
             if (!newValue.equals(stringValue)) return true;

             return false;

         }

-        public void finalize() throws Throwable {

+        @SuppressWarnings("deprecation")

+		@Override

+		public void finalize() throws Throwable {

             this.oldValue = null;

             this.newValue = null;

             super.finalize();