Changeset 86 for java/main/src/main/java/com/framsticks/params/ParamBuilder.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/ParamBuilder.java (modified) (14 diffs)

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

@@ -1 +1 @@
 package com.framsticks.params;
 
+import com.framsticks.params.annotations.FramsClassAnnotation;
+import com.framsticks.params.annotations.ParamAnnotation;
 import com.framsticks.params.types.*;
 import com.framsticks.util.lang.Numbers;
@@ -8 +10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+
 
 /**
@@ -18 +21 @@
  */
 
+@FramsClassAnnotation(name = "prop", id = "prop")
 public class ParamBuilder {
         private final static Logger log = Logger.getLogger(ParamBuilder.class.getName());
@@ -28 +32 @@
         private static final String FLAGS_FIELD = "flags";
 
-        /** The parameter getId. */
+        /** The parameter id. */
         private String id;
 
         /**
-         * The parameter internal getId. It's set by a user to use user's own getId in
+         * The parameter internal id. It's set by a user to use user's own id in
          * code
          */
@@ -40 +44 @@
         private Integer group = 0;
 
-        /** The getFlags stored as a bit sum. */
+        /** The flags stored as a bit sum. */
         private Integer flags = 0;
 
-        /** The parameter getName. */
+        /** The parameter name. */
         private String name;
 
-        /** The getHelp (description) concerning parameter. */
+        /** The help (description) concerning parameter. */
         private String help;
 
-        /** The getType of parameter. */
+        /** The type of parameter. */
         private Class<? extends Param> paramType;
 
         private Param param;
         private PrimitiveParam primitiveParam;
-
-        ParamBuilder() {
+        private String typeString;
+
+        public ParamBuilder() {
         }
 
@@ -76 +81 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder id(String id) {
                 this.id = id;
@@ -87 +93 @@
                         primitiveParam = (PrimitiveParam) param;
                 }
+                typeString = param.getFramsTypeName();
                 return this;
         }
 
         public <T extends Param> ParamBuilder type(Class<T> type) {
+                assert type != null;
                 try {
                         return internalSetType(type, type.newInstance());
@@ -104 +112 @@
 
 
+        /**
+         * @return the id
+         */
+        @ParamAnnotation
+        public String getId() {
+                return id;
+        }
+
         public ParamBuilder setInternalId(String internalId) {
                 this.internalId = internalId;
@@ -109 +125 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder group(Integer group) {
                 this.group = group;
@@ -114 +131 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder flags(Integer flags) {
                 this.flags = flags;
@@ -119 +137 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder name(String name) {
                 this.name = name;
@@ -143 +162 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder type(String type) {
+                typeString = type;
 
                 log.trace("parsing type: " + type);
@@ -233 +254 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder help(String help) {
                 this.help = help;
                 return this;
+        }
+
+        /**
+         * @return the group
+         */
+        @ParamAnnotation
+        public Integer getGroup() {
+                return group;
+        }
+
+        /**
+         * @return the flags
+         */
+        @ParamAnnotation
+        public Integer getFlags() {
+                return flags;
+        }
+
+        /**
+         * @return the name
+         */
+        @ParamAnnotation
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * @return the help
+         */
+        @ParamAnnotation
+        public String getHelp() {
+                return help;
+        }
+
+        @ParamAnnotation
+        public String getType() {
+                return typeString;
         }
 
@@ -328 +387 @@
 
 
-        public static FramsClass getFramsClass() {
-                return new FramsClass("prop", "prop", null)
-                        .append(Param.build().id("name").name("Name").type(StringParam.class))
-                        .append(Param.build().id("id").name("Id").type(StringParam.class))
-                        .append(Param.build().id("type").name("Type").type(StringParam.class))
-                        .append(Param.build().id("help").name("Help").type(StringParam.class))
-                        .append(Param.build().id("group").name("Group").type(DecimalParam.class))
-                        .append(Param.build().id("flags").name("Flags").type(DecimalParam.class));
-        }
 
 }