Changeset 86 for java/main/src/main/java/com/framsticks/core

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?.

Location:

java/main/src/main/java/com/framsticks/core

Files:

• Entity.java (modified) (3 diffs)
• Instance.java (modified) (6 diffs)

java/main/src/main/java/com/framsticks/core/Entity.java

@@ -3 +3 @@
 import javax.annotation.OverridingMethodsMustInvokeSuper;
 
-import com.framsticks.params.FramsClass;
+import com.framsticks.params.annotations.FramsClassAnnotation;
+import com.framsticks.params.annotations.ParamAnnotation;
 import com.framsticks.util.dispatching.Thread;
 import com.framsticks.util.dispatching.Dispatcher;
@@ -14 +15 @@
  * @author Piotr Sniegowski
  */
+@FramsClassAnnotation
 public abstract class Entity implements Dispatcher<Entity> {
 
-        private final static Logger log = Logger.getLogger(Entity.class.getName());
+        private final static Logger log = Logger.getLogger(Entity.class);
 
+        @ParamAnnotation
         protected String name = "entity";
         protected EntityOwner owner;
@@ -109 +112 @@
         }
 
-        public static void constructFramsClass(FramsClass.Constructor constructor) {
-                constructor.method("getName");
-        }
 }

java/main/src/main/java/com/framsticks/core/Instance.java

@@ -23 +23 @@
         private static final Logger log = Logger.getLogger(Instance.class.getName());
 
-
         protected Node root;
 
@@ -34 +33 @@
         protected void run() {
                 super.run();
-                root = new Node((CompositeParam)Param.build().name("Instance").id(name).type("o").finish(), null);
+                root = new Node((CompositeParam) Param.build().name("Instance").id(name).type("o").finish(), null);
                 com.framsticks.model.Package.register(registry);
         }
@@ -112 +111 @@
         }
 
-
         protected void fireListChange(Path path, ListChange change) {
                 assert isActive();
@@ -127 +125 @@
         }
 
-
         public final FramsClass getInfoFromCache(Path path) {
                 return getInfoFromCache(path.getTop().getParam().getContainedTypeName());
         }
 
-
         public FramsClass getInfoFromCache(String id) {
                 assert isActive();
@@ -140 +136 @@
         protected Registry registry = new Registry();
 
-        public AccessInterface createAccess(String name) {
+        public AccessInterface createAccess(String name) throws ConstructionException {
                 assert isActive();
                 return registry.createAccess(name);
         }
-
 
         // TODO: make ValueParam
@@ -165 +160 @@
         public final AccessInterface bindAccess(Node node) {
                 assert node.getObject() != null;
-                AccessInterface access = registry.prepareAccess(node.getParam());
-                if (access == null) {
-                        log.error("missing access for: " + node.getParam());
-                        return null;
-                }
-                access.select(node.getObject());
-                return access;
+
+                try {
+                        return registry.prepareAccess(node.getParam()).select(node.getObject());
+                } catch (ConstructionException e) {
+                        log.error("failed to bind access for " + node.getParam() + ": " + e);
+                }
+                return null;
         }