Changeset 105 for java/main/src/main/java/com/framsticks/params/PropertiesAccess.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/PropertiesAccess.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package com.framsticks.params;
-
-import java.util.HashMap;
-import java.util.Map;
 
 import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.ProcedureParam;
-
 
 /**
@@ -18 +14 @@
 public class PropertiesAccess extends SimpleAbstractAccess {
 
-        public Map<String, Object> properties;
+        protected PropertiesObject properties;
 
         @Override
-        public Map<String, Object> createAccessee() {
-                return PropertiesAccess.createPropertiesMap();
-        }
-
-        public static Map<String, Object> createPropertiesMap() {
-                return new HashMap<String, Object>();
+        public PropertiesObject createAccessee() {
+                return new PropertiesObject(framsClass.getId());
         }
 
@@ -43 +35 @@
                 assert properties != null;
                 assert param != null;
-                Object object = properties.get(param.getId());
-                if (object != null) {
-                        try {
-                                return type.cast(object);
-                        } catch (ClassCastException e) {
-                                throw (ClassCastException) new ClassCastException("property " + param + " type is " + object.getClass().getName() + ", not " + type.getName()).initCause(e);
-                        }
+                Object object = properties.get(param.getId(), Object.class);
+                if (object == null) {
+                        return null;
                 }
                 try {
-                        return param.getDef(type);
+                        return type.cast(object);
                 } catch (ClassCastException e) {
-                        throw (ClassCastException) new ClassCastException("default value of property " + param + " is not of type " + type.getName()).initCause(e);
+                        throw (ClassCastException) new ClassCastException("property " + param + " type is " + object.getClass().getName() + ", not " + type.getName()).initCause(e);
                 }
-
         }
 
         @Override
         protected <T> void internalSet(ValueParam param, T value) {
-                properties.put(param.getId(), value);
+                properties.set(param.getId(), value);
         }
 
@@ -73 +60 @@
          *            the properties with parameters values
          */
-        @SuppressWarnings("unchecked")
         @Override
         public PropertiesAccess select(Object object) {
-                properties = ParamsUtil.selectObjectForAccess(this, object, Map.class);
+                properties = ParamsUtil.selectObjectForAccess(this, object, PropertiesObject.class);
                 return this;
         }
@@ -82 +68 @@
         /** covariant */
         @Override
-        public Map<String, Object> getSelected() {
+        public PropertiesObject getSelected() {
                 return properties;
         }
@@ -97 +83 @@
 
         @Override
-        public Object call(String id, Object[] arguments) {
+        public Object call(String id, Object... arguments) {
                 throw new InvalidOperationException().msg("properties access does not support calling methods").arg("id", id);
         }
 
         @Override
-        public Object call(ProcedureParam param, Object[] arguments) {
+        public Object call(ProcedureParam param, Object... arguments) {
                 throw new InvalidOperationException().msg("properties access does not support calling methods").arg("param", param);
         }