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

Timestamp:

06/22/13 21:51:33 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• simplification of entities management model
• cleanup around params (improve hierarchy)
• migrate from JUnit to TestNG
• introduce FEST to automatically test GUI
• improve slider control
• loosen synchronization between gui tree and backend representation
• and many other bug fixes

NOTICE:

• a great many of lines is changed only because of substituting spaces with tabs

CHANGELOG (oldest changes at the bottom):

Some cleaning after fix found.

Fix bug with tree.

More changes with TreeNodes?.

Finally fix issue with tree.

Improve gui tree management.

Decouple update of values from fetch request in gui.

Minor changes.

Minor changes.

Minor change.

Change Path construction wording.

More fixes to SliderControl?.

Fix SliderControl?.

Fix SliderControl?.

Minor improvement.

Several changes.

Make NumberParam? a generic class.

Add robot to the gui test.

Setup common testing logging configuration.

Remove Parameters class.

Remove entityOwner from Parameters.

Move name out from Parameters class.

Move configuration to after the construction.

Simplify observers and endpoints.

Remove superfluous configureEntity overrides.

Add dependency on fest-swing-testng.

Use FEST for final print test.

Use FEST for more concise and readable assertions.

Divide test of F0Parser into multiple methods.

Migrate to TestNG

Minor change.

Change convention from LOGGER to log.

Fix reporting of errors during controls filling.

Bound maximal height of SliderControl?.

Minor improvements.

Improve tooltips for controls.

Also use Delimeted in more places.

Move static control utilities to Gui.

Rename package gui.components to controls.

Some cleaning in controls.

Improve Param classes placing.

Move ValueParam?, PrimitiveParam? and CompositeParam? one package up.

Improve ParamBuilder?.

Move getDef to ValueParam? and PrimitiveParam?.

Move getMax and getDef to ValueParam?.

Move getMin to ValueParam?.

Upgrade to laters apache commons versions.

Use filterInstanceof extensively.

Add instanceof filters.

Make ValueParam? in many places of Param.

Place assertions about ValueParam?.

Add ValueParam?

Rename ValueParam? to PrimitiveParam?

Minor changes.

Several improvements to params types.

Add NumberParam?.

Add TextControl? component.

Add .swp files to .gitignore

Greatly improved slider component.

Some improvements.

Make Param.reassign return also a state.

Add IterableIterator?.

Several changes.

• Move util classes to better packages.
• Remove warnings from eclim.

Several improvements.

Fix bug with BooleanParam?.

Some experiments with visualization.

Another fix to panel management.

Improve panel management.

Some refactorization around panels.

Add root class for panel.

Location:

java/main

Files:

• . (modified) (1 prop)
• src/main/java/com/framsticks/params/ParamBuilder.java (modified) (19 diffs)

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

@@ -2 +2 @@
 
 import com.framsticks.params.types.*;
+import com.framsticks.util.lang.Numbers;
+
 import org.apache.log4j.Logger;
 
@@ -9 +11 @@
 /**
  * The class ParamBuilder helps building Param objects.
- * 
+ *
  * @author Mateusz Jarus <name.surname@gmail.com> (please replace name and
  *         surname with my personal data)
@@ -17 +19 @@
 
 public class ParamBuilder {
-        private final static Logger LOGGER = Logger.getLogger(ParamBuilder.class.getName());
+        private final static Logger log = Logger.getLogger(ParamBuilder.class.getName());
 
         private static final String ID_FIELD = "id";
@@ -48 +50 @@
 
         /** The getType of parameter. */
-        @SuppressWarnings("rawtypes")
-        private Class paramType;
+        private Class<? extends Param> paramType;
 
         private Param param;
+        private PrimitiveParam primitiveParam;
 
         /**
          * Build Param based on provided data.
-         * 
+         *
          * @return Param object
          * @throws Exception
@@ -61 +63 @@
          */
         public Param build()  {
-        assert param != null;
+                assert param != null;
                 param.id = id;
                 param.name = name;
@@ -68 +70 @@
                 param.flags = flags;
                 param.internalId = internalId;
-
                 return param;
         }
@@ -77 +78 @@
         }
 
+        protected <T extends Param> ParamBuilder internalSetType(Class<? extends Param> type, T param) {
+                this.paramType = type;
+                this.param = param;
+                if (param instanceof PrimitiveParam) {
+                        primitiveParam = (PrimitiveParam) param;
+                }
+                return this;
+        }
+
         public <T extends Param> ParamBuilder setType(Class<T> type) {
-                this.paramType = type;
                 try {
-                        this.param = (Param)paramType.newInstance();
+                        return internalSetType(type, type.newInstance());
                 } catch (InstantiationException e) {
                         e.printStackTrace();
@@ -89 +98 @@
         }
 
-        public <T extends Param> ParamBuilder setType(T type) {
-                this.paramType = type.getClass();
-                this.param = type;
-                return this;
+        public <T extends Param> ParamBuilder setType(T param) {
+                return internalSetType(param.getClass(), param);
         }
 
@@ -116 +123 @@
         }
 
+        protected <T extends Number> void parseMinMaxDefNumber(Class<T> type, String second, String third) {
+                if (primitiveParam == null) {
+                        log.warn("param is not a primitive param");
+                        return;
+                }
+                if (second != null) {
+                        this.primitiveParam.min = Numbers.parse(second, type);
+                        if (this.primitiveParam.min == null) {
+                                log.warn("value of min attribute was invalid");
+                        }
+                }
+                if (third != null) {
+                        this.primitiveParam.max = Numbers.parse(third, type);
+                        if (this.primitiveParam.max == null) {
+                                log.warn("value of min attribute was invalid");
+                        }
+                }
+        }
+
         public ParamBuilder setType(String type) {
 
-                LOGGER.trace("parsing type: " + type);
+                log.trace("parsing type: " + type);
 
                 String[] typeSplitted = type.split(" ");
@@ -136 +162 @@
                                         procedureParam.parseSignature(signature);
                                 } catch (Exception e) {
-                                        LOGGER.error("invalid procedure signature '" + signature + "': " + e);
+                                        log.error("invalid procedure signature '" + signature + "': " + e);
                                 }
                                 setType(procedureParam);
@@ -148 +174 @@
                                 } else {
                                         if (first.length() >= 2) {
-                                                switch (first.charAt(1)) {
+                                switch (first.charAt(1)) {
                                                         case 'b': {
                                                                 setType(BinaryParam.class);
@@ -159 +185 @@
                                                 }
                                         }
-                    if ("0".equals(second) && "1".equals(third)) {
-                        setType(BooleanParam.class);
-                    }
+                                        if ("0".equals(second) && "1".equals(third)) {
+                                                setType(BooleanParam.class);
+                                        }
                                         if (param == null) {
                                                 setType(DecimalParam.class);
@@ -167 +193 @@
                                 }
                                 if (this.param instanceof DecimalParam) {
-                                        try {
-                                                if (second != null) {
-                                                        this.param.min = Integer.parseInt(second);
-                                                }
-
-                                                if (third != null) {
-                                                        this.param.max = Integer.parseInt(third);
-                                                }
-                                        } catch (NumberFormatException e) {
-                                                LOGGER.warn("value of min or max attribute should be an Integer");
-                                        }
+                                        parseMinMaxDefNumber(Integer.class, second, third);
                                 }
                                 break;
@@ -183 +199 @@
                         case 'f': {
                                 setType(FloatParam.class);
-                                try {
-                                        if (second != null) {
-                                                this.param.min = Double.parseDouble(second);
-                                        }
-
-                                        if (third != null) {
-                                                this.param.max = Double.parseDouble(third);
-                                        }
-                                } catch (NumberFormatException ex) {
-                                        LOGGER.warn("Value of min or max attribute should be Double");
-                                }
+                                parseMinMaxDefNumber(Double.class, second, third);
                                 break;
                         }
@@ -202 +208 @@
                         case 's': {
                                 setType(StringParam.class);
-                                this.param.min = second;
-                                this.param.max = third;
+                                setMin(second);
+                                setMax(third);
                                 break;
                         }
@@ -211 +217 @@
                         }
                         case 'l': {
-
                                 setType(third != null ? new UniqueListParam(second, third) : new ArrayListParam(second));
                                 break;
@@ -225 +230 @@
         }
 
+        /**
+         * @return the paramType
+         */
+        public Class<? extends Param> getParamType() {
+                return paramType;
+        }
+
         public <T> ParamBuilder setMin(T min) {
-                this.param.min = min;
+                if (primitiveParam != null) {
+                        this.primitiveParam.min = min;
+                }
                 return this;
         }
 
         public <T> ParamBuilder setMax(T max) {
-                this.param.max = max;
+                if (primitiveParam != null) {
+                        this.primitiveParam.max = max;
+                }
                 return this;
         }
 
         public <T> ParamBuilder setDef(T def) {
-                this.param.def = def;
-                return this;
+                if (def != null && primitiveParam != null) {
+                        this.primitiveParam.def = def;
+                }
+                return this;
+        }
+
+        public Class<?> getStorageType() {
+                assert param != null;
+                return param.getStorageType();
         }
 
@@ -244 +267 @@
 
                 if (paramEntryValues.length == 0) {
-                        LOGGER.warn("field empty or wrong format (" + line
+                        log.warn("field empty or wrong format (" + line
                                         + ") - omitting");
                         return null;
@@ -263 +286 @@
                         /** everything is ok, parameters have just finished*/
                 } catch (NumberFormatException ex) {
-                        LOGGER.warn("wrong format of entry: " + line
+                        log.warn("wrong format of entry: " + line
                                         + ", omitting");
                         return null;