Changeset 99 for java/main/src/main/java/com/framsticks/remote/RemoteTree.java

Timestamp:

07/10/13 22:41:02 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGTS:

• complete events implementation
  • visible as EventListener?<Argument> from Java code
  • support in both RemoteTree? and LocalTree?
  • support at Java server side
  • automated argument printing and parsing
  • EventParams? are recognized when building FramsClass? from annotation for Java classes
• add CLI in Java Framsticks server
• add automatic registration for events in GUI
• improve objects fetching (object are never overwritten with new instances)
• properly react for ListChange? events
• add ListPanel? with table view
  • columns to be shown may be statically specified in configuration
  • currently modyfying data through tables is not available
• improve maven configuration
  • configuration file may be specified without touching pom.xml

CHANGELOG:
Extract constants from Flags into ParamFlags? and SetStateFlags?.

Extract flags I/O to FlagsUtils? class.

Configured maven to exec given resource configuration.

For example:
mvn exec:exec -Dframsticks.config=/configs/managed-console.xml

Cleanup pom.xml

Rename ObjectTree? to LocalTree? (also make LocalTree? and RemoteTree? final).

Minor change.

Add maximum number of columns in ListPanelProvider?.

Improve ColumnsConfig? interpretation.

Automatically fill FramsClass?.name if trying to construct empty.

Improve identitifer case mangling in XmlLoader?.

Introduce configurable ColumnsConfig?.

Draft working version of ListPanel?.

Table is being shown (although empty).

More improvements to table building.

Move some functionality from Frame to TreeModel?.

Move tree classes in gui to separate package.

Remove old table related classes.

Add draft implementation of TableModel?.

Redirect ParamBuilder?.forAccess to AccessInterface?.

Optimize ParamBuilder?.forAccess()

Do not clear list when loading.

Do not load fetched values directly.

Implement different AccessInterface? copying policy.

Optimize fetching values routine.

Remove Mode enum (work out get semantics).

Some improvements to ListChange? handling.

Improve UniqueListAccess?.

Add reaction for ListChanges? in the TreeNode?.

EventListeners? are being added in the TreeNode?.

Listeners for ListParams? are now very naive (they download
whole list).

Automatially register on events in GUI.

Events are working in RemoteTree? and Server.

Move listeners to the ClientSideManagedConnection?.

Remove old classes responsible for event subscriptions.

Improve event reading.

Improve events handling at server side.

Add register attribute in FramsClassAnnotation?
to automatically also register other classes.

Registering events works.

Setup for remote listeners registration.

More improvements.

Minor changes.

Add rootTree to the ClientAtServer?.

Moving CLI to the ClientAtServer?.

Fix bug: use Void.TYPE instead of Void.class

More development around CLI.

• Improve Path resolving.

Add synthetic root to ObjectTree?.

It is needed to allow sybling for the original root
that would containg CLI.

Some work with registering events in RemoteTree?.

Draft implementation of listener registering in RemoteTree?.

Support events registration in the ObjectTree?.

Add events support to ReflectionAccess?.

EventParam? is recognized by ParamCandidate?.

Prepare interface for Events across project.

Add EventListener? and API for listeners in Tree.

File:

• java/main/src/main/java/com/framsticks/remote/RemoteTree.java (modified) (7 diffs)

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

@@ -7 +7 @@
 import com.framsticks.communication.queries.SetRequest;
 import com.framsticks.core.AbstractTree;
-import com.framsticks.core.Mode;
-import com.framsticks.core.ListChange;
 import com.framsticks.core.Path;
 import com.framsticks.params.*;
+import com.framsticks.params.EventListener;
 import com.framsticks.params.annotations.AutoAppendAnnotation;
 import com.framsticks.params.annotations.FramsClassAnnotation;
@@ -28 +27 @@
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
 import com.framsticks.util.lang.Casting;
-import com.framsticks.util.lang.Pair;
 import com.framsticks.util.dispatching.RunAt;
 import static com.framsticks.core.TreeOperations.*;
@@ -42 +40 @@
  */
 @FramsClassAnnotation
-public class RemoteTree extends AbstractTree implements JoinableParent {
+public final class RemoteTree extends AbstractTree implements JoinableParent {
 
         private final static Logger log = Logger.getLogger(RemoteTree.class);
 
         protected ClientSideManagedConnection connection;
-
-        protected final Set<Pair<Path, Subscription<?>>> subscriptions = new HashSet<>();
-
-        public Pair<Path, Subscription<?>> getSubscription(Path path) {
-                for (Pair<Path, Subscription<?>> s : subscriptions) {
-                        if (s.first.isTheSameObjects(path)) {
-                                return s;
-                        }
-                }
-                return null;
-        }
 
         public RemoteTree() {
@@ -88 +75 @@
 
         @Override
-        public void get(final Path path, final ValueParam param, Mode mode, final Future<Object> future) {
+        public void get(final Path path, final ValueParam param, final Future<Object> future) {
                 assert isActive();
                 assert param != null;
@@ -166 +153 @@
 
         @Override
-        public void get(final Path path, final Mode mode, final Future<Path> future) {
+        public void get(final Path path, final Future<Path> future) {
                 assert isActive();
 
@@ -187 +174 @@
         }
 
-
-        @Override
-        protected void tryRegisterOnChangeEvents(final Path path) {
-                assert isActive();
-                AccessInterface access = bindAccess(path);
-                if (!(access instanceof ListAccess)) {
-                        return;
-                }
-
-                assert path.size() >= 2;
-                FramsClass underFramsClass = getInfoFromCache(path.getUnder().getParam().getContainedTypeName());
-
-                EventParam changedEvent;
-                try {
-                        changedEvent = underFramsClass.getParamEntry(path.getTop().getParam().getId() + "_changed", EventParam.class);
-                } catch (FramsticksException e) {
-                        return;
-                }
-
-                log.debug("registering for " + changedEvent);
-                if (getSubscription(path) != null) {
-                        return;
-                }
-
-                final Pair<Path, Subscription<?>> temporary = new Pair<>(path, null);
-                subscriptions.add(temporary);
-
-                connection.subscribe(path.getTextual() + "_changed", this, new SubscriptionCallback<Tree>() {
-                        @Override
-                        public EventCallback subscribed(final Subscription<? super Tree> subscription) {
-                                if (subscription == null) {
-                                        log.error("failed to subscribe for change event for " + path);
-                                        return null;
-                                }
-                                log.debug("subscribed for change event for " + path);
-                                // subscription.setDispatcher(RemoteInstance.this);
-                                RemoteTree.this.dispatch(new RunAt<Tree>(this) {
-                                        @Override
-                                        protected void runAt() {
-                                                subscriptions.remove(temporary);
-                                                subscriptions.add(new Pair<Path, Subscription<?>>(path, subscription));
-                                        }
-                                });
-                                return new EventCallback() {
-                                        @Override
-                                        public void call(List<File> files) {
-                                                assert isActive();
-                                                assert files.size() == 1;
-                                                final MultiParamLoader loader = new MultiParamLoader();
-                                                loader.setNewSource(files.get(0).getContent());
-                                                loader.addBreakCondition(MultiParamLoader.Status.AfterObject);
-                                                loader.addListener(MultiParamLoader.Status.OnComment, new MultiParamLoader.StatusListener() {
-
-                                                        @Override
-                                                        public void onStatusChange() {
-                                                                throw new FramsticksException().msg("multi param loader error").arg("line", loader.getCurrentLine());
-                                                        }
-                                                });
-                                                ReflectionAccess access = new ReflectionAccess(ListChange.class, FramsClass.build().forClass(ListChange.class));
-                                                loader.addAccessInterface(access);
-
-                                                MultiParamLoader.Status status;
-                                                while ((status = loader.go()) != MultiParamLoader.Status.Finished) {
-                                                        if (status == MultiParamLoader.Status.AfterObject) {
-                                                                AccessInterface accessInterface = loader.getLastAccessInterface();
-                                                                reactToChange(path, (ListChange) accessInterface.getSelected());
-                                                        }
-                                                }
-                                        }
-                                };
-                        }
-                });
-        }
-
-        protected Future<Path> futureListChanger(final ListChange listChange, final String path) {
-                return new FutureHandler<Path>(Logging.logger(log, "failed to " + listChange, path)) {
-                        @Override
-                        protected void result(Path result) {
-                                log.debug(listChange + ": " + result);
-                        }
-                };
-        }
-
-        protected void reactToChange(final Path path, final ListChange listChange) {
-                assert isActive();
-                log.debug("reacting to change " + listChange + " in " + path);
-                AccessInterface access = bindAccess(path);
-                assert access != null;
-
-                if ((listChange.getAction() == ListChange.Action.Modify) && (listChange.getPosition() == -1)) {
-                        final String p = path.getTextual();
-                        tryGet(this, p, futureListChanger(listChange, p));
-                        return;
-                }
-
-                CompositeParam childParam = Casting.tryCast(CompositeParam.class, access.getParam(listChange.getBestIdentifier()));
-                assert childParam != null;
-                switch (listChange.getAction()) {
-                        case Add: {
-                                final String p = path.getTextual() + "/" + childParam.getId();
-                                tryGet(this, p, futureListChanger(listChange, p));
-                                break;
-                        }
-                        case Remove: {
-                                access.set(childParam, null);
-                                break;
-                        }
-                        case Modify: {
-                                final String p = path.getTextual() + "/" + childParam.getId();
-                                tryGet(this, p, futureListChanger(listChange, p));
-                                break;
-                        }
-                }
-        }
-
         @Override
         public void set(final Path path, final PrimitiveParam<?> param, final Object value, final Future<Integer> future) {
@@ -380 +252 @@
         }
 
-        // @Override
-        // public Path create(Path path) {
-        //      assert isActive();
-        //      assert !path.isResolved();
-        //      Path resolved = path.tryFindResolution();
-        //      if (!resolved.isResolved()) {
-        //              log.debug("creating: " + path);
-        //              //TODO: access parent here, check if it is valid, only then create
-        //              AccessInterface access = registry.prepareAccess(path.getTop().getParam());
-        //              assert access != null;
-        //              Object child = access.createAccessee();
-        //              assert child != null;
-        //              if (path.size() == 1) {
-        //                      setRoot(new Node(getRoot().getParam(), child));
-        //              } else {
-        //                      bindAccess(this, path.getUnder()).set(path.getTop().getParam(), child);
-        //              }
-        //              resolved = path.appendResolution(child);
-        //      }
-        //      tryRegisterOnChangeEvents(resolved);
-        //      return resolved;
-        // }
+        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) {
+                assert isActive();
+                assert path.isResolved();
+                if ((!argumentType.equals(Object.class)) && (null == registry.getFramsClassForJavaClass(argumentType))) {
+                        registry.registerAndBuild(argumentType);
+                }
+
+                final EventListener<File> proxyListener = new EventListener<File>() {
+
+                        @Override
+                        public void action(final File file) {
+                                Dispatching.dispatchIfNotActive(RemoteTree.this, new RunAt<RemoteTree>(RemoteTree.this) {
+
+                                        @Override
+                                        protected void runAt() {
+                                                assert isActive();
+                                                if (argumentType.equals(Object.class)) {
+                                                        listener.action(Casting.tryCast(argumentType, file));
+                                                        return;
+                                                }
+                                                AccessInterface access = registry.createAccess(argumentType);
+                                                Object argument = access.createAccessee();
+                                                access.select(argument);
+                                                if (!argumentType.isInstance(argument)) {
+                                                        throw new FramsticksException().msg("created argument is of wrond type").arg("expected", argumentType).arg("created", argument.getClass());
+                                                }
+                                                A typedArgument = argumentType.cast(argument);
+
+                                                // log.info("executing event with argument " + argumentType);
+                                                MultiParamLoader loader = new MultiParamLoader();
+                                                loader.setNewSource(file.getContent());
+                                                loader.addBreakCondition(MultiParamLoader.Status.AfterObject);
+                                                loader.addAccessInterface(access);
+                                                loader.go();
+
+                                                listener.action(typedArgument);
+                                        }
+                                });
+                        }
+                };
+
+                proxyListeners.put(listener, proxyListener);
+
+                connection.addListener(Path.appendString(path.getTextual(), param.getId()), proxyListener, this, future);
+        }
+
+        public void removeListener(Path path, EventParam param, EventListener<?> listener, Future<Void> future) {
+                assert isActive();
+                EventListener<File> proxyListener = proxyListeners.get(listener);
+                connection.removeListener(proxyListener, this, future);
+        }
 
 }