Changeset 90 for java/main/src/main/java/com/framsticks/params/ParamBuilder.java

Timestamp:

07/02/13 16:20:07 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add ObjectInstance? for holding local object trees
• fix params ordering issue in automically created FramsClasses?
• support for automated Builders in XmlLoader?
• fix bug preventing multiple GUI tests in single test run
• implement Groups in FramsClass?
• improve ProcedureParam?:
  • calling in ObjectInstance?
  • support in GUI

CHANGELOG:
Make ProcedureParam? hold only ValueParams?.

Use id instead of names when naming gui components internally.

Basic procedure calling in GUI.

The actual procedure call is currently only backed
by the ObjectInstance?.

Add UnimplementedException?.

Improve naming of various gui elements.

Allow easy navigating in FEST Swing testing.

Add optional explicit order attribute to FramsClassAnnotation?.

That's because java reflection does return declared members
in any specific order. That ordering is needed only for
classes that have no representation in framsticks and need
a deterministic ordering of params.

Add ControlOwner? interface.

Add test for procedure calling in Browser.

First version of ParamAnnotation? for procedures.

Development of ProcedureParam?.

Add draft version of ProcedureParam? implementation in ReflectionAccess?.

Allow viewing FramsClasses? in gui Browser.

Extract ResourceBuilder? from ModelBuilder?.

Remove internalId from Param.

It was currently completely not utilised. Whether it is still needed
after introduction of ParamAnnotation? is arguable.

Add remaining param attributes to ParamAnnotation?.

Change AutoBuilder? semantics.

AutoBuilder? returns list of objects that are to be appended
with methods @AutoAppendAnnotation?.

This allows to omit explicit addition of ModelPackage? to instance
if the instance uses ModelBuilder? (registration of ModelPackage? comes
from schema).

Fix params ordering problem in auto created FramsClasses?.

Improve ObjectInstance?.

Several fixes to ModelBuilder?.

Improve test for ObjectInstance? in Browser.

Make initialization of robot static.

With robot recreated for second browser test, the test hanged
deep in AWT.

Add base convenience base test for Browser tests.

More tests to ObjectInstance?.

Rename Dispatcher.invokeLater() to dispatch().

Add assertDispatch.

It allows assertions in other threads, than TestNGInvoker.
Assertions are gathered after each method invocation and rethrown.

Use timeOut annotation attribute for tests involving some waiting.

Remove firstTask method (merge with joinableStart).

Clean up leftovers.

Remove unused FavouritesXMLFactory (the reading part is already
completely done with generic XmlLoader?, and writing part will be done
based on the same approach if needed).
Move UserFavourite? to the com.framsticks.gui.configuration package.

Remove GenotypeBrowser? as to specific.

This functionality will be available in ObjectInstance?.

Add interface ParamsPackage?.

Package containing registration of Java classes meant to use with
ReflectionAccess? may be in Instance using configuration.

Minor changes.

Make Group immutable.

Add AutoBuilder? interface extending Builder - only those would
be used to automatically build from XML.

Fix groups in FramsClass?.

Minor naming cleanup in Registry.

Add ModelComponent? interface.

All class creating the Model are implementing that interface.

Extract Model.build into ModelBuilder?.

ModelBuilder? will be compatible with other builders
and allow using it from configuration.

Fix NeuroConnection?.

Add synchronous get operation for dispatchers.

Rename JoinableMonitor? to Monitor.

Add ObjectInstance?.

This class is mainly for demonstration
and testing purposes.

Improve FramsServer? runner.

• improve ExternalProcess? runner,
• runner can kill the server but also react properly, when the server exists on it's own,
• set default path to search for framsticks server installation,
• add LoggingOutputListener?.

File:

• java/main/src/main/java/com/framsticks/params/ParamBuilder.java (modified) (16 diffs)

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

@@ -11 +11 @@
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nonnull;
 
 /**
@@ -37 +42 @@
         private String id;
 
-        /**
-         * The parameter internal id. It's set by a user to use user's own id in
-         * code
-         */
-        private String internalId;
-
         /** The number of group, that parameter belongs to. */
-        private Integer group = 0;
+        private Integer group;
 
         /** The flags stored as a bit sum. */
@@ -76 +75 @@
         }
 
+        protected ValueParam resultType;
+
+        protected List<ValueParam> argumentsType;
 
         /**
@@ -114 +116 @@
 
         /**
+         * @return the resultType
+         */
+        public ValueParam getResultType() {
+                return resultType;
+        }
+
+
+        /**
+         * @param resultType the resultType to set
+         */
+        public ParamBuilder resultType(ValueParam resultType) {
+                this.resultType = resultType;
+                return this;
+        }
+
+        /**
+         * @return the argumentsType
+         */
+        public List<ValueParam> getArgumentsType() {
+                return argumentsType;
+        }
+
+
+        /**
+         * @param argumentsType the argumentsType to set
+         */
+        public ParamBuilder argumentsType(List<ValueParam> argumentsType) {
+                this.argumentsType = argumentsType;
+                return this;
+        }
+
+        /**
          * @return the enumValues
          */
@@ -121 +155 @@
 
         /**
-         * @return the procedureSignature
-         */
-        public String getProcedureSignature() {
-                return procedureSignature;
-        }
-
-        /**
          * @return the uid
          */
         public String getUid() {
                 return uid;
+        }
+
+        public @Nonnull <T extends Param> T finish(Class<T> requested) {
+                Param param = finish();
+                if (!requested.isInstance(param)) {
+                        throw new FramsticksException().msg("param is of wrong type").arg("requested", requested).arg("actual", param.getClass());
+                }
+                return requested.cast(param);
         }
 
@@ -141 +176 @@
          *             when Param getType is not defined
          */
-        public Param finish() {
+        public @Nonnull Param finish() {
                 try {
                         if (paramType == null) {
                                 throw new FramsticksException().msg("trying to finish incomplete param");
                         }
-
                         return paramType.getConstructor(ParamBuilder.class).newInstance(this);
                 } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | FramsticksException e) {
@@ -165 +199 @@
         }
 
-        // public <T extends Param> ParamBuilder type(T param) {
-        //      return internalSetType(param.getClass(), param);
-        // }
-
-
         /**
          * @return the id
@@ -178 +207 @@
         }
 
-        /**
-         * @return the internalId
-         */
-        public String getInternalId() {
-                return internalId;
-        }
-
-        public ParamBuilder setInternalId(String internalId) {
-                this.internalId = internalId;
-                return this;
-        }
-
         @ParamAnnotation
         public ParamBuilder group(Integer group) {
@@ -208 +225 @@
         }
 
-        protected <T extends Number> void parseMinMaxDefNumber(Class<T> type, String second, String third) {
+        protected <T extends Number> void parseMinMaxDefNumber(Class<T> type, String second, String third, String fourth) {
                 if (second != null) {
                         min = second;
@@ -214 +231 @@
                 if (third != null) {
                         max = third;
+                }
+                if (fourth != null) {
+                        def = fourth;
                 }
         }
@@ -223 +243 @@
                 return type(EnumParam.class);
         }
-
-        protected String procedureSignature;
 
         protected String uid;
@@ -239 +257 @@
                 String second = typeSplitted.length > 1 ? typeSplitted[1] : null;
                 String third = typeSplitted.length > 2 ? typeSplitted[2] : null;
+                String fourth = typeSplitted.length > 3 ? typeSplitted[3] : null;
 
                 switch (first.charAt(0)) {
@@ -247 +266 @@
                         }
                         case 'p': {
-                                procedureSignature = type.substring(1);
                                 type(ProcedureParam.class);
+                                signature(type.substring(1));
                                 break;
                         }
@@ -281 +300 @@
                                 }
                                 if (DecimalParam.class.isAssignableFrom(this.paramType)) {
-                                        parseMinMaxDefNumber(Integer.class, second, third);
+                                        parseMinMaxDefNumber(Integer.class, second, third, fourth);
                                 }
                                 break;
@@ -287 +306 @@
                         case 'f': {
                                 type(FloatParam.class);
-                                parseMinMaxDefNumber(Double.class, second, third);
+                                parseMinMaxDefNumber(Double.class, second, third, fourth);
                                 break;
                         }
@@ -472 +491 @@
         }
 
-
         public Class<?> getStorageType() {
                 return storageType;
         }
+
+        public ParamBuilder forAccess(AccessInterface access) {
+                return name(access.getId()).type("o " + access.getId());
+        }
+
+        protected static ValueParam parseProcedureTypePart(String type, String name) {
+                return Param.build().type(type).name(name).id(name).finish(ValueParam.class);
+        }
+
+        private static Pattern addressPattern = Pattern.compile("^([^\\(]+)?\\(([^\\)]*)\\)$");
+
+        public ParamBuilder signature(String signature) {
+                argumentsType = new ArrayList<>();
+
+                if (!Strings.notEmpty(signature)) {
+                        resultType = null;
+                        return this;
+                }
+                Matcher matcher = addressPattern.matcher(signature);
+                if (!matcher.matches()) {
+                        throw new FramsticksException().msg("invalid signature");
+                }
+                String result = Strings.collapse(matcher.group(1));
+                resultType = (result != null) ? parseProcedureTypePart(result, null) : null;
+                String arguments = matcher.group(2);
+                if (!Strings.notEmpty(arguments)) {
+                        return this;
+                }
+                int number = 0;
+                for (String a : arguments.split(",")) {
+                        int space = a.indexOf(' ');
+                        String type;
+                        String name;
+                        if (space == -1) {
+                                type = a;
+                                name = "arg" + number;
+                        } else {
+                                type = a.substring(0, space);
+                                name = a.substring(space + 1);
+                        }
+                        argumentsType.add(parseProcedureTypePart(type, name));
+                        ++number;
+                }
+                return this;
+        }
+
+
+        public ParamBuilder idAndName(String name) {
+                id(name);
+                name(name);
+                return this;
+        }
 }