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

Timestamp:

07/14/13 23:20:04 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• improve tree side notes
• improve GUI layout
• add foldable list of occured events to EventControl?
• improve automatic type conversion in proxy listeners
• implement several Access functionalities as algorithms independent of Access type
• introduce draft base classes for distributed experiments
• automatically register dependant Java classes to FramsClass? registry
• add testing prime experiment and configuration
• simplify and improve task dispatching

CHANGELOG:
Improve task dispatching in RemoteTree?.

GUI no longer hangs on connection problems.

Make all dispatchers joinables.

Refactorize Thread dispatcher.

Remove Task and PeriodicTask?.

Use Java utilities in those situations.

Reworking tasks dispatching.

Fix bug in EventControl? listener dispatching.

Minor improvements.

Add testing configuration for ExternalProcess? in GUI.

More improvement to prime.

Support for USERREADONLY in GUI.

Add that flag to various params in Java classes.

Remove redundant register clauses from several FramsClassAnnotations?.

Automatically gather and register dependant classes.

Add configuration for prime.

Improve Simulator class.

Add prime.xml configuration.

Introduce draft Experiment and Simulator classes.

Add prime experiment tests.

Enclose typical map with listeners into SimpleUniqueList?.

Needfile works in GUI.

Improve needfile handling in Browser.

More improvement with NeedFile?.

Implementing needfile.

Update test.

Rename ChangeEvent? to TestChangeEvent?.

Automatic argument type search in RemoteTree? listeners.

MultiParamLoader? uses AccessProvider?. By default old implementation
enclosed in AccessStash? or Registry.

Minor changes.

Rename SourceInterface? to Source.

Also improve toString of File and ListSource?.

Remove unused SimpleSource? class.

Add clearing in HistoryControl?.

Show entries in table at EventControl?.

Improve EventControl?.

Add listeners registration to EventControl?.

Add foldable table to HistoryControl?.

Add control row to Procedure and Event controls.

Improve layout of controls.

Another minor change to gui layout.

Minor improvement in the SliderControl?.

Minor changes.

Move ReflectionAccess?.Backend to separate file.

It was to cluttered.

Cleanup in ReflectionAccess?.

Move setMin, setMax, setDef to AccessOperations?.

Extract loading operation into AccessOperations?.

Append Framsticks to name of UnsupportedOperationException?.

The java.lang.UnsupportedOperationException? was shadowing this class.

Rename params.Util to params.ParamsUtil?.

Several improvements.

• Merge ValueControlListener? into ControlOwner?.
• Remove several deprecated utility classes.
• Add EventListeners? utility container.

Minor changes.

Implement revert functionality.

Improve local changes management.

Minor improvement.

Remove methods rendered superfluous after SideNoteKey? improvement.

Improve SideNoteKey?.

It is now generic type, so explicit type specification at
call site is no more needed.

Introduce SideNoteKey? interface.

Only Objects implementing that key may be used as side note keys.

Minor improvements.

Use strings instead of ValueControls? in several gui mappings.

File:

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

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

@@ -10 +10 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -15 +16 @@
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -75 +78 @@
         protected final OneTime<Method> adder = new OneTime<>("adder");
         protected final OneTime<Method> remover = new OneTime<>("remover");
+        protected int flags = 0;
 
         protected final List<ParamAnnotation> annotations = new LinkedList<>();
@@ -162 +166 @@
         public List<ParamAnnotation> getAnnotations() {
                 return Collections.unmodifiableList(annotations);
+        }
+
+        protected final java.util.Set<Class<?>> dependantClasses = new HashSet<>();
+
+        // public void addDependantClass(Class<?> javaClass) {
+        //      dependantClasses.add(javaClass);
+        // }
+
+        /**
+         * @return the dependantClasses
+         */
+        public java.util.Set<Class<?>> getDependantClasses() {
+                return Collections.unmodifiableSet(dependantClasses);
         }
 
@@ -247 +264 @@
                 this.name.set(name);
                 annotations.add(paramAnnotation);
+                flags |= paramAnnotation.flags();
                 if (member instanceof Field) {
                         field.set((Field) member);
@@ -299 +317 @@
 
         public int getFlags() {
-                int f = 0;
+                int f = flags;
                 if (isReadOnly()) {
                         f |= ParamFlags.READONLY;
@@ -341 +359 @@
                 protected final Map<String, ParamCandidate> candidates;
                 protected final List<ParamCandidate> order;
+                protected final java.util.Set<Class<?>> dependantClasses = new HashSet<>();
 
                 /**
@@ -364 +383 @@
                         return order;
                 }
-        }
+
+                public java.util.Set<Class<?>> getDependentClasses() {
+                        return dependantClasses;
+                }
+        }
+
+        protected static final Map<Class<?>, Set> setsCache = Collections.synchronizedMap(new IdentityHashMap<Class<?>, Set>());
 
         public static Set getAllCandidates(Class<?> javaClass) throws ConstructionException {
+                Set result = setsCache.get(javaClass);
+                if (result != null) {
+                        return result;
+                }
 
                 List<Class<?>> javaClasses = new LinkedList<>();
@@ -374 +403 @@
                 }
 
-                Set resultSet = new Set(new HashMap<String, ParamCandidate>(), new LinkedList<ParamCandidate>());
+                result = new Set(new HashMap<String, ParamCandidate>(), new LinkedList<ParamCandidate>());
 
                 for (Class<?> j : javaClasses) {
-                        Set set = new Set(resultSet.getCandidates(), new LinkedList<ParamCandidate>());
+                        Set set = new Set(result.getCandidates(), new LinkedList<ParamCandidate>());
+
                         filterParamsCandidates(set, j.getDeclaredFields());
                         filterParamsCandidates(set, j.getDeclaredMethods());
@@ -383 +413 @@
                         FramsClassAnnotation fa = j.getAnnotation(FramsClassAnnotation.class);
                         if (fa != null) {
+
+                                if (j != javaClass) {
+                                        result.dependantClasses.add(j);
+                                }
+                                for (Class<?> r : fa.register()) {
+                                        result.dependantClasses.add(r);
+                                }
+
+
                                 final List<String> order = Arrays.asList(fa.order());
                                 Collections.sort(set.getOrder(), new Comparator<ParamCandidate>() {
@@ -396 +435 @@
                                 });
                         }
-                        resultSet.getOrder().addAll(0, set.getOrder());
-                }
-
-                for (ParamCandidate pc : resultSet.getOrder()) {
+                        result.getOrder().addAll(0, set.getOrder());
+                }
+
+                for (ParamCandidate pc : result.getOrder()) {
                         pc.validate();
-                }
-
-                return resultSet;
+                        pc.induceParamType(Param.build());
+                        result.dependantClasses.addAll(pc.getDependantClasses());
+                }
+
+                setsCache.put(javaClass, result);
+
+                return result;
         }
 
@@ -425 +468 @@
         }
 
+        protected ParamBuilder induceParamType(ParamBuilder builder, Type type) {
+                // if (type.equals(Void.TYPE)) {
+                //      throw new ConstructionException().msg("void is not a valid type");
+                // }
+
+                if (type instanceof ParameterizedType) {
+                        ParameterizedType p = (ParameterizedType) type;
+                        Type rawType = p.getRawType();
+                        Type containedType = null;
+                        //TODO make implementation here
+                        boolean map = false;
+                        StringBuilder b = new StringBuilder();
+                        if (rawType.equals(Map.class)) {
+                                containedType = p.getActualTypeArguments()[1];
+                                map = true;
+                                b.append("l");
+                        } else if (rawType.equals(List.class)) {
+                                containedType = p.getActualTypeArguments()[0];
+                                b.append("l");
+                        } else if (rawType.equals(EventListener.class)) {
+                                containedType = p.getActualTypeArguments()[0];
+                                b.append("e");
+                        }
+                        if (!(containedType instanceof Class)) {
+                                return builder;
+                        }
+                        b.append(" ");
+
+                        Class<?> containedClass = (Class<?>) containedType;
+                        FramsClassAnnotation fca = containedClass.getAnnotation(FramsClassAnnotation.class);
+                        if (fca == null) {
+                                throw new ConstructionException().msg("the contained class is not annotated").arg("class", containedClass);
+                        }
+                        dependantClasses.add(containedClass);
+                        b.append(FramsClassBuilder.getName(fca, containedClass));
+                        //TODO parameterize this
+                        if (map) {
+                                b.append(" uid");
+                        }
+
+                        builder.type(b.toString());
+                        return builder;
+                }
+
+                if (type instanceof Class) {
+
+                        Class<?> cl = (Class<?>) type;
+
+                        // TODO: future support for enum
+                        // if (cl.isEnum()) {
+                        //      Class<? extends Enum<?>> enumType = (Class<? extends Enum<?>>) cl;
+                        //      Enum<?>[] enums = enumType.getEnumConstants();
+                        //      StringBuilder b = new StringBuilder();
+
+                        //      b.append("d 0 ").append(enums.length - 1).append(" 0 ");
+                        //      for (Enum<?> e : enums) {
+                        //              b.append("~").append(e.name());
+                        //      }
+                        //      return b.toString();
+                        // }
+                        if (cl.equals(Integer.class) || cl.equals(int.class)) {
+                                builder.type("d");
+                                return builder;
+                        }
+                        if (cl.equals(String.class)) {
+                                builder.type("s");
+                                return builder;
+                        }
+                        if (cl.equals(Double.class) || cl.equals(double.class)) {
+                                builder.type("f");
+                                return builder;
+                        }
+                        if (cl.equals(Boolean.class) || cl.equals(boolean.class)) {
+                                builder.type( "d 0 1");
+                                return builder;
+                        }
+                        if (cl.equals(Object.class)) {
+                                builder.type("x");
+                                return builder;
+                        }
+
+
+                        // builder.type("o " + (cl).getCanonicalName());
+                        builder.type("o " + cl.getSimpleName());
+                        dependantClasses.add(cl);
+                        builder.fillStorageType(cl);
+                        return builder;
+                }
+
+                throw new ConstructionException().msg("failed to find framsticks for native type").arg("type", type);
+        }
+
+
+        public ParamBuilder induceParamType(ParamBuilder builder) {
+                Method method = getCaller();
+                if (method == null) {
+                        return induceParamType(builder, getType());
+                }
+
+                if (!method.getReturnType().equals(Void.TYPE)) {
+                        builder.resultType(induceParamType(Param.build(), method.getGenericReturnType()).finish(ValueParam.class));
+                }
+
+                List<ValueParam> arguments = new ArrayList<>();
+                int number = 0;
+                for (Type arg : method.getGenericParameterTypes()) {
+                        arguments.add(induceParamType(Param.build(), arg).idAndName("arg" + (number++)).finish(ValueParam.class));
+                }
+                builder.argumentsType(arguments);
+
+                return builder;
+        }
+
 };