Changeset 105 for java/main/src/main/java/com/framsticks/params/ParamCandidate.java

Timestamp:

09/10/13 21:11:41 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• import refactorization: move Tree, Path, etc.

from core to structure package

• initial serialization implementation
• improve PrimeExperiment? test
• many organizational changes and convenience improvements

CHANGELOG:
Make registry in AbstractTree? final.

Move most classes from core to structure package.

Minor changes.

Switch names of Future and FutureHandler?.

Rename ExceptionResultHandler? to ExceptionHandler?.

Rename ExceptionHandler? to ExceptionDispatcherHandler?.

Fix bug in ParamCandidate? cache.

Add missing synchronization to the BufferedDispatcher?.

Develop @Serialized support.

Rework serialization further.

Add serialization/deserialization interface to ValueParam?.

Move getStorageType and isNumeric from Param down to params hierarchy.

Minor changes.

Improve param type induction.

Add TestSerializedClass? for testing new serialization.

Add info files gor GenePool? and Population.

Add standard.expt exemplary netfile.

Add type name field to PropertiesObject?.

Use PropertiesObject? for PropertiesAccess? instead of ordinary map.

Hide getFramsClass is several more places.

More unification accross FramsClass?, Access and Path.

Add ParamCollection?.

Simplify interface for getting params from FramsClass?, Access
or Path.

Make Access.call() interface variadic.

Add arguments(args) convenience wrapper around new Object[] {args}.

Upgrade to apache.commons.lang version 3.1

Minor improvement with Response constructors.

Develop proper result printing in ClientAtServer?.

Add experimentNetsave to PrimeExperiment?.

File:

• java/main/src/main/java/com/framsticks/params/ParamCandidate.java (modified) (7 diffs)

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

@@ -79 +79 @@
         protected final OneTime<Method> adder = new OneTime<>("adder");
         protected final OneTime<Method> remover = new OneTime<>("remover");
+        protected final OneTime<Class<? extends Param>> paramType = new OneTime<>("paramType");
+
         protected int flags = 0;
 
@@ -262 +264 @@
         }
 
+        // public static <T extends Param> boolean isParamAnnorationOfTypeOrUnspecified(ParamAnnotation paramAnnotation, Class<T> paramType) {
+        //      return paramAnnotation.paramType().equals(Param.class) || paramAnnotation.paramType().equals(paramType);
+        // }
+
+        // public static <T extends Param> boolean isParamAnnorationOfType(ParamAnnotation paramAnnotation, Class<T> paramType) {
+        //      return paramAnnotation.paramType().equals(paramType);
+        // }
+
         void add(ParamAnnotation paramAnnotation, Member member, String name) {
                 this.name.set(name);
                 annotations.add(paramAnnotation);
                 flags |= paramAnnotation.flags();
+                if (!paramAnnotation.paramType().equals(Param.class)) {
+                        paramType.set(paramAnnotation.paramType());
+                }
                 if (member instanceof Field) {
                         field.set((Field) member);
@@ -273 +286 @@
                 if (member instanceof Method) {
                         Method m = (Method) member;
-                        if (!paramAnnotation.paramType().equals(Param.class)) {
-                                if (paramAnnotation.paramType().equals(ProcedureParam.class)) {
-                                        caller.set(m);
-                                        return;
-                                }
-                                throw new ConstructionException().msg("explicit set of paramType different than ProcedureParam is not yet supported").arg("name", name).arg("method", m).arg("in", this);
+                        if (paramAnnotation.paramType().equals(ProcedureParam.class)) {
+                                caller.set(m);
+                                return;
                         }
                         Type[] ps = m.getGenericParameterTypes();
@@ -392 +402 @@
         protected static final Map<Class<?>, Set> setsCache = Collections.synchronizedMap(new IdentityHashMap<Class<?>, Set>());
 
-        public static Set getAllCandidates(Class<?> javaClass) throws ConstructionException {
+        public static Set getAllCandidates(final Class<?> javaClass) throws ConstructionException {
                 Set result = setsCache.get(javaClass);
                 if (result != null) {
@@ -399 +409 @@
 
                 List<Class<?>> javaClasses = new LinkedList<>();
-                while (javaClass != null) {
-                        javaClasses.add(0, javaClass);
-                        javaClass = javaClass.getSuperclass();
+                Class<?> jc = javaClass;
+                while (jc != null) {
+                        javaClasses.add(0, jc);
+                        jc = jc.getSuperclass();
                 }
 
@@ -473 +484 @@
                 //      throw new ConstructionException().msg("void is not a valid type");
                 // }
+
 
                 if (type instanceof ParameterizedType) {
@@ -562 +574 @@
         }
 
-
         public ParamBuilder induceParamType(ParamBuilder builder) {
                 Method method = getCaller();
                 if (method == null) {
+                        if (paramType.has()) {
+                                return builder.type(paramType.get());
+                        }
                         return induceParamType(builder, getType());
                 }