Changeset 99 for java/main/src/main/java/com/framsticks/core/TreeOperations.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/core/TreeOperations.java (modified) (7 diffs)

java/main/src/main/java/com/framsticks/core/TreeOperations.java

@@ -2 +2 @@
 
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -10 +12 @@
 import com.framsticks.communication.File;
 import com.framsticks.params.AccessInterface;
-import com.framsticks.params.CompositeParam;
+import com.framsticks.params.EventListener;
 import com.framsticks.params.FramsClass;
 import com.framsticks.params.ListAccess;
 import com.framsticks.params.Param;
 import com.framsticks.params.PrimitiveParam;
+import com.framsticks.params.UniqueListAccess;
+import com.framsticks.params.Util;
+import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.ObjectParam;
 import com.framsticks.params.types.ProcedureParam;
@@ -73 +78 @@
 
                         ListAccess listAccess = (ListAccess) bindAccess(node);
-                        listAccess.clearValues();
+
+                        Set<String> oldValuesIds = new HashSet<>();
+                        for (Param p : listAccess.getParams()) {
+                                oldValuesIds.add(p.getId());
+                        }
+
+                        // listAccess.clearValues();
 
                         AccessInterface elementAccess = listAccess.getElementAccess();
+                        AccessInterface clonerInterface = elementAccess.cloneAccess();
+
                         loader.addAccessInterface(elementAccess);
                         MultiParamLoader.Status status;
+                        int number = 0;
                         while ((status = loader.go()) != MultiParamLoader.Status.Finished) {
                                 if (status == MultiParamLoader.Status.AfterObject) {
                                         AccessInterface accessInterface = loader.getLastAccessInterface();
 
-                                        String id = listAccess.computeIdentifierFor(accessInterface.getSelected());
-                                        //TODO listAccessParam
-                                        CompositeParam param = Param.build().forAccess(accessInterface).id(id).finish(CompositeParam.class);
-                                        Object child = accessInterface.getSelected();
+                                        String id;
+                                        if (listAccess instanceof UniqueListAccess) {
+                                                id = ((UniqueListAccess) listAccess).computeIdentifierFor(accessInterface.getSelected());
+                                        } else {
+                                                id = Integer.toString(number);
+                                        }
+                                        ++number;
+
+                                        Object childTo = listAccess.get(id, Object.class);
+                                        boolean newOne;
+                                        if (childTo == null) {
+                                                childTo = clonerInterface.createAccessee();
+                                                newOne = true;
+                                        } else {
+                                                assert oldValuesIds.contains(id);
+                                                newOne = false;
+                                        }
+                                        oldValuesIds.remove(id);
+                                        clonerInterface.select(childTo);
+                                        Util.takeAllNonNullValues(clonerInterface, accessInterface);
+                                        if (newOne) {
+                                                listAccess.set(id, childTo);
+                                        }
+
+                                        // listAccess.set(id, accessInterface.getSelected());
                                         accessInterface.select(null);
-                                        assert child != null;
-                                        bindAccess(node).set(param, child);
+
                                 }
+                        }
+                        /** It looks tricky for ArrayListAccess but should also work.
+                         *
+                         * They should be sorted.
+                         */
+                        for (String id : oldValuesIds) {
+                                listAccess.set(id, null);
                         }
 
@@ -170 +211 @@
         }
 
-
-        /** This might not be correct. */
+        public static <A> void addListener(final Path path, final EventParam param, final EventListener<A> listener, final Class<A> argument, final Future<Void> future) {
+                final Tree tree = path.getTree();
+
+                dispatchIfNotActive(tree, new RunAt<Tree>(future) {
+                        @Override
+                        protected void runAt() {
+                                tree.addListener(path, param, listener, argument, future);
+                        }
+                });
+        }
+
+        public static void removeListener(final Path path, final EventParam param, final EventListener<?> listener, final Future<Void> future) {
+                final Tree tree = path.getTree();
+
+                dispatchIfNotActive(tree, new RunAt<Tree>(future) {
+                        @Override
+                        protected void runAt() {
+                                tree.removeListener(path, param, listener, future);
+                        }
+                });
+        }
+
+
+        /**
+         *
+         * If StackOverflow occurs in that loop in LocalTree it is probably caused
+         * the by the fact, that get operation may find the object, but Path resolution
+         * cannot.
+         * */
         public static void tryGet(final Tree tree, final String targetPath, final Future<Path> future) {
                 log.debug("resolve textual: " + targetPath + " for " + tree);
@@ -178 +246 @@
                         @Override
                         protected void runAt() {
-                                final Path path = Path.to(tree, targetPath);
+                                final Path path = Path.tryTo(tree, targetPath).tryResolveIfNeeded();
+                                log.debug("found: " + path);
                                 if (path.isResolved()) {
                                         future.pass(path);
@@ -184 +253 @@
                                 }
 
-                                tree.get(path, Mode.FETCH, new FutureHandler<Path>(future) {
+                                tree.get(path, new FutureHandler<Path>(future) {
                                         @Override
                                         protected void result(Path result) {
+                                                // if (result.isResolved(targetPath)) {
+                                                //      future.pass(result);
+                                                //      return;
+                                                // }
+                                                log.debug("retrying resolve textual: " + targetPath + " for " + tree + " with " + result);
                                                 tryGet(tree, targetPath, future);
                                         }
@@ -198 +272 @@
                 return path.getTree().getInfoFromCache(path.getTop().getParam().getContainedTypeName());
         }
+
 }