Changeset 105 for java/main/src/main/java/com/framsticks/remote/RemoteTree.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/remote/RemoteTree.java (modified) (14 diffs)

java/main/src/main/java/com/framsticks/remote/RemoteTree.java

@@ -6 +6 @@
 import com.framsticks.communication.queries.InfoRequest;
 import com.framsticks.communication.queries.SetRequest;
-import com.framsticks.core.AbstractTree;
-import com.framsticks.core.ListChange;
-import com.framsticks.core.Path;
-import com.framsticks.core.ValueChange;
 import com.framsticks.params.*;
 import com.framsticks.params.EventListener;
@@ -17 +13 @@
 import com.framsticks.params.types.ProcedureParam;
 import com.framsticks.parsers.Loaders;
+import com.framsticks.structure.AbstractTree;
+import com.framsticks.structure.Path;
+import com.framsticks.structure.messages.ListChange;
+import com.framsticks.structure.messages.ValueChange;
 import com.framsticks.util.*;
 import com.framsticks.util.dispatching.AtOnceDispatcher;
 import com.framsticks.util.dispatching.Dispatching;
 import com.framsticks.util.dispatching.DispatchingFuture;
-import com.framsticks.util.dispatching.ExceptionResultHandler;
+import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.Future;
-import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.Joinable;
 import com.framsticks.util.dispatching.JoinableParent;
@@ -29 +28 @@
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
 import com.framsticks.util.dispatching.RunAt;
-import static com.framsticks.core.TreeOperations.*;
+
+import static com.framsticks.structure.TreeOperations.*;
 
 import java.util.*;
@@ -80 +80 @@
         }
 
-        protected ExceptionResultHandler pathRemoveHandler(final Path path, final ExceptionResultHandler handler) {
-                return new ExceptionResultHandler() {
+        protected ExceptionHandler pathRemoveHandler(final Path path, final ExceptionHandler handler) {
+                return new ExceptionHandler() {
 
                         @Override
@@ -114 +114 @@
         // }
 
-        protected final Map<String, Set<Future<FramsClass>>> infoRequests = new HashMap<String, Set<Future<FramsClass>>>();
+        protected final Map<String, Set<FutureHandler<FramsClass>>> infoRequests = new HashMap<String, Set<FutureHandler<FramsClass>>>();
 
 
@@ -124 +124 @@
          * */
         @Override
-        public void info(final Path path, final Future<FramsClass> future) {
+        public void info(final Path path, final FutureHandler<FramsClass> future) {
 
                 final String name = path.getTop().getParam().getContainedTypeName();
@@ -134 +134 @@
 
                 log.debug("issuing info request for {}", name);
-                final Set<Future<FramsClass>> futures = new HashSet<Future<FramsClass>>();
+                final Set<FutureHandler<FramsClass>> futures = new HashSet<FutureHandler<FramsClass>>();
                 futures.add(future);
                 infoRequests.put(name, futures);
 
-                final Future<FramsClass> compositeFuture = DispatchingFuture.create(this, new Future<FramsClass>() {
+                final FutureHandler<FramsClass> compositeFuture = DispatchingFuture.create(this, new FutureHandler<FramsClass>() {
 
                         @Override
@@ -144 +144 @@
                                 assert isActive();
                                 infoRequests.remove(name);
-                                for (Future<FramsClass> f : futures) {
+                                for (FutureHandler<FramsClass> f : futures) {
                                         f.handle(exception);
                                 }
@@ -154 +154 @@
                                 putInfoIntoCache(framsClass);
                                 infoRequests.remove(name);
-                                for (Future<FramsClass> f : futures) {
+                                for (FutureHandler<FramsClass> f : futures) {
                                         f.pass(framsClass);
                                 }
@@ -183 +183 @@
 
         @Override
-        public void get(final Path path, final Future<Path> future) {
-                assert isActive();
-                final ExceptionResultHandler remover = pathRemoveHandler(path, future);
+        public void get(final Path path, final FutureHandler<Path> future) {
+                assert isActive();
+                final ExceptionHandler remover = pathRemoveHandler(path, future);
 
                 log.trace("fetching values for {}", path);
-                findInfo(path, new FutureHandler<FramsClass>(remover) {
+                findInfo(path, new Future<FramsClass>(remover) {
                         @Override
                         protected void result(FramsClass result) {
@@ -204 +204 @@
 
         @Override
-        public void set(final Path path, final PrimitiveParam<?> param, final Object value, final Future<Integer> future) {
+        public void set(final Path path, final PrimitiveParam<?> param, final Object value, final FutureHandler<Integer> future) {
                 assert isActive();
                 final Integer flag = bindAccess(path).set(param, value);
@@ -267 +267 @@
 
         @Override
-        public <R> void call(@Nonnull final Path path, @Nonnull final ProcedureParam procedure, @Nonnull Object[] arguments, final Class<R> resultType, final Future<R> future) {
+        public <R> void call(@Nonnull final Path path, @Nonnull final ProcedureParam procedure, @Nonnull Object[] arguments, final Class<R> resultType, final FutureHandler<R> future) {
                 assert isActive();
                 assert path.isResolved();
@@ -294 +294 @@
         protected final Map<EventListener<?>, EventListener<File>> proxyListeners = new IdentityHashMap<>();
 
-        public <A> void addListener(Path path, EventParam param, final EventListener<A> listener, final Class<A> argumentType, final Future<Void> future) {
+        public <A> void addListener(Path path, EventParam param, final EventListener<A> listener, final Class<A> argumentType, final FutureHandler<Void> future) {
                 assert isActive();
                 assert path.isResolved();
@@ -322 +322 @@
         }
 
-        public void removeListener(Path path, EventParam param, EventListener<?> listener, Future<Void> future) {
+        public void removeListener(Path path, EventParam param, EventListener<?> listener, FutureHandler<Void> future) {
                 assert isActive();
                 EventListener<File> proxyListener = proxyListeners.get(listener);