Changeset 86 for java/main/src/main/java/com/framsticks/params/SimpleAbstractAccess.java

Timestamp:

06/26/13 13:27:31 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• use java annotations to mark classes and fields to be used when:
  • using java classes with ReflectionAccess? to represent remote objects with FramsClass? description found by "info ..." requests
  • to build up FramsClass? representation of objects not present at remote server
• allow using primitive types (instead of wraping counterparts) in reflected classes
• rework FramsClass? creation process (add FramsClassBuilder?)
• add more tests

CHANGELOG:
Prepare model.World class.

Minor change.

Use primitive types for Genotype and Creature classes.

Use primitive types in model.Neuro* classes.

Use primitive types in model.Joint* classes.

Use primitive types in model.Part* classes.

Fix primitive values.

Extract FramsClassBuilder?.

Add tests of Model classes.

More fixes.

Refactorize out ParamCandidate?.

Several fixes.

Fix all regressions after introducing annotations.

Use annotations throughout the project.

Add exception classes.

Improve creation of FramsClass?.

More changes.

Many changes regarding annotations.

Annotate classes in com.framsticks.model package.

Remove manual FramsClass? constructor.

Construct FramsClass? for Creature. Add test.

Add default values to the ParamAnnotation?.

Add ParamBuilderTest? and ParamAnnotation?.

Add FramsClassAnnotation?.

File:

• java/main/src/main/java/com/framsticks/params/SimpleAbstractAccess.java (modified) (3 diffs)

java/main/src/main/java/com/framsticks/params/SimpleAbstractAccess.java

@@ -65 +65 @@
         @Override
         public Param getParam(int i) {
-                return framsClass.getParamEntry(i, Param.class);
+                return framsClass.getParam(i);
         }
 
         @Override
         public Param getParam(String id) {
-                return framsClass.getParamEntry(id, Param.class);
+                return framsClass.getParam(id);
         }
 
@@ -80 +80 @@
         @Override
         public <T> T get(int i, Class<T> type) {
-                Param p = getParam(i);
-                assert p instanceof ValueParam;
-                return get((ValueParam) p, type);
+                return get(framsClass.getParamEntry(i, ValueParam.class), type);
         }
 
         @Override
         public <T> T get(String id, Class<T> type) {
-                Param p = getParam(id);
-                assert p instanceof ValueParam;
-                return get((ValueParam) p, type);
+                return get(framsClass.getParamEntry(id, ValueParam.class), type);
+        }
+
+        @Override
+        public <T> int set(int i, T value) {
+                return set(framsClass.getParamEntry(i, ValueParam.class), value);
         }
 
         @Override
         public <T> int set(String id, T value) {
-                Param p = getParam(id);
-                assert p instanceof ValueParam;
-                return set((ValueParam) p, value);
-        }
-
-        @Override
-        public <T> int set(int i, T value) {
-                Param p = getParam(i);
-                assert p instanceof ValueParam;
-                return set((ValueParam) p, value);
+                return set(framsClass.getParamEntry(id, ValueParam.class), value);
         }
 
@@ -115 +107 @@
                         ReassignResult<?> result = param.reassign(value, oldValue);
                         Object casted = result.getValue();
-                        if (casted != oldValue) {
+                        if (!casted.equals(oldValue)) {
                                 internalSet(param, casted);
                         }