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

Timestamp:

06/30/13 12:48:20 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• loading f0 schema with XmlLoader?
• use XmlLoader? to load configuration
• introduce unified fork-join model of various entities

(Instances, Connections, GUI Frames, etc.),
all those entities clean up gracefully on
shutdown, which may be initialized by user
or by some entity

• basing on above, simplify several organizing classes

(Observer, main class)

• add ExternalProcess? runner and it's extension: FramsServer?

(to host native frams server process from Java level)

CHANGELOG:
Remove redundant Observer class.

Clean up in AbstractJoinable?.

Update ExternalProcess? class to changes in joining model.

Another sweep through code with FindBugs?.

Find bug with not joining RemoteInstance?.

Joining almost works.

Much improved joining model.

More improvement to joining model.

Add logging messages around joinable operations.

Rename methods in AbstractJoinable?.

Improve Joinable.

Rewrite of entity structure.

More simplifications with entities.

Further improve joinables.

Let Frame compose from JFrame instead of inheriting.

Add join classes.

Improvements of closing.

Add Builder interface.

Add FramsServerTest?.xml

FramsServer? may be configured through xml.

Make Framsticks main class an Observer of Entities.

Make Observer a generic type.

Remove variables regarding to removed endpoint.

Simplify observer (remove endpoints).

More changes to Observer and Endpoint.

Minor improvements.

Add OutputListener? to ExternalProcess?.

Improve testing of ExternalProcess?.

Add ExternalProcess? runner.

Rename the Program class to Framsticks.

Migrate Program to use XmlLoader? configuration.

First steps with configuration using XmlLoader?.

Fix several bugs.

Move all f0 classes to apriopriate package.

XmlLoader? is able to load Schema.

XmlLoader? is loading classes and props.

Add GroupBuilder?.

File:

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

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

@@ -4 +4 @@
 import com.framsticks.params.annotations.ParamAnnotation;
 import com.framsticks.params.types.*;
+import com.framsticks.util.Builder;
 import com.framsticks.util.FramsticksException;
 import com.framsticks.util.lang.Strings;
@@ -23 +24 @@
 
 @FramsClassAnnotation(name = "prop", id = "prop")
-public class ParamBuilder {
+public class ParamBuilder implements Builder<Param> {
         private final static Logger log = Logger.getLogger(ParamBuilder.class.getName());
 
@@ -63 +64 @@
         private Object def;
 
+        private Integer extra;
+
         String containedTypeName;
+
+        protected Class<?> storageType;
 
         protected FramsClassBuilder classBuilder;
@@ -83 +88 @@
          * @return the min
          */
+        @ParamAnnotation
         public Object getMin() {
                 return min;
@@ -90 +96 @@
          * @return the max
          */
+        @ParamAnnotation
         public Object getMax() {
                 return max;
@@ -97 +104 @@
          * @return the def
          */
+        @ParamAnnotation
         public Object getDef() {
                 return def;
@@ -135 +143 @@
         public 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 e) {
+                } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | FramsticksException e) {
                         throw new FramsticksException().msg("failed to create param").cause(e).arg("name", name);
                 }
@@ -219 +231 @@
         public ParamBuilder type(String type) {
                 // typeString = type;
+                assert type != null;
 
                 log.trace("parsing type: " + type);
@@ -352 +365 @@
         }
 
+        @ParamAnnotation(id = "xtra")
+        public Integer getExtra() {
+                return extra;
+        }
+
         /**
          * @return the paramType
@@ -359 +377 @@
         }
 
+        @ParamAnnotation(id = "xtra")
+        public ParamBuilder extra(Integer extra) {
+                this.extra = extra;
+                return this;
+        }
+
+        @ParamAnnotation
         public ParamBuilder min(Object min) {
                 this.min = min;
@@ -364 +389 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder max(Object max) {
                 this.max = max;
@@ -369 +395 @@
         }
 
+        @ParamAnnotation
         public ParamBuilder def(Object def) {
                 this.def = def;
@@ -374 +401 @@
         }
 
-        // public Class<?> getStorageType() {
-        //      assert param != null;
-        //      return param.getStorageType();
-        // }
 
         public Param build(String line) throws Exception {
@@ -435 +458 @@
         }
 
-        public ParamBuilder defaultDef(Object def) {
+        public ParamBuilder fillDef(Object def) {
                 if (this.def == null) {
                         return def(def);
@@ -442 +465 @@
         }
 
+        public ParamBuilder fillStorageType(Class<?> storageType) {
+                if (this.storageType == null) {
+                        this.storageType = storageType;
+                }
+                return this;
+        }
+
+
+        public Class<?> getStorageType() {
+                return storageType;
+        }
 }
+