Changeset 97 for java/main/src/main/java/com/framsticks/core/Path.java

Timestamp:

07/06/13 03:51:11 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add proper exception passing between communication sides:

if exception occur during handling client request, it is
automatically passed as comment to error response.

• unify various functors into Future<T>
• add FutureHandler?<T> using passed ExceptionHandler?
• organize Connections functionalities in more granular way
• add TrackConsole?

it may be used to snoop communication between peers

• fix algorithm choosing text controls in GUI
• allow GUI testing in virtual frame buffer (xvfb)

FEST had some problem with xvfb but workaround was found

• add StatusBar? to show handled exceptions
• add DirectConsole? to communicate with server by hand

supports tab-completion based on requests history

CHANGELOG:
Further improve handling of exceptions in GUI.

Add StatusBar? implementing ExceptionResultHandler?.

Make completion processing asynchronous.

Minor changes.

Improve completion in console.

Improve history in InteractiveConsole?.

First working version of DirectConsole?.

Minor changes.

Make Connection.address non final.

It is more suitable to use in configuration.

Improvement of consoles.

Improve PopupMenu? and closing of FrameJoinable?.

Fix BrowserTest?.

Found bug with FEST running under xvfb.

JButtonFixture.click() is not working under xvfb.
GuiTest? has wrapper which uses JButton.doClick() directly.

Store CompositeParam? param in TreeNode?.

Simplify ClientSideManagedConnection? connecting.

There is now connectedFunctor needed, ApplicationRequests? can be
send right after creation. They are buffered until the version
and features are negotiated.

Narow down interface of ClientSideManagedConnection?.

Allow that connection specialization send only
ApplicationRequests?.

Improve policy of text control choosing.

Change name of Genotype in BrowserTest?.

Make BrowserTest? change name of Genotype.

Minor change.

First working draft of TrackConsole?.

Simplify Consoles.

More improvements with gui joinables.

Unify initialization on gui joinables.

More rework of Frame based entities.

Refactorize structure of JFrames based entities.

Extract GuiTest? from BrowserBaseTest?.

Reorganize Console classes structure.

Add Collection view to JoinableCollection?.

Configure timeout in testing.

Minor changes.

Rework connections hierarchy.

Add Mode to the get operation.

Make get and set in Tree take PrimitiveParam?.

Unify naming of operations.

Make RunAt? use the given ExceptionHandler?.

It wraps the virtual runAt() method call with
try-catch passing exception to handler.

Force RunAt? to include ExceptionHandler?.

Improve ClientAtServer?.

Minor change.

Another sweep with FindBugs?.

Rename Instance to Tree.

Minor changes.

Minor changes.

Further clarify semantics of Futures.

Add FutureHandler?.

FutureHandler? is refinement of Future, that proxifies
exception handling to ExceptionResultHandler? given
at construction time.

Remove StateFunctor? (use Future<Void> instead).

Make Connection use Future<Void>.

Unparametrize *ResponseFuture?.

Remove StateCallback? not needed anymore.

Distinguish between sides of ResponseFuture?.

Base ResponseCallback? on Future (now ResponseFuture?).

Make asynchronous store taking Future for flags.

Implement storeValue in ObjectInstance?.

File:

• java/main/src/main/java/com/framsticks/core/Path.java (modified) (15 diffs)

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

@@ -23 +23 @@
         // private final static Logger log = Logger.getLogger(Path.class.getName());
 
-        final Instance instance;
+        final Tree tree;
         final String textual;
         final LinkedList<Node> nodes;
 
-        protected static Object getKnownChild(Instance instance, AccessInterface access, CompositeParam param) {
+        protected static Object getKnownChild(Tree tree, AccessInterface access, CompositeParam param) {
                 Object child = access.get(param, Object.class);
                 if (child == null) {
@@ -33 +33 @@
                 }
                 try {
-                        instance.prepareAccess(param);
+                        tree.prepareAccess(param);
                         return child;
                 } catch (FramsticksException e) {
@@ -41 +41 @@
 
         /**
-         * @param instance
+         * @param tree
          * @param textual
          * @param nodes
          */
-        Path(Instance instance, String textual, LinkedList<Node> nodes) {
-                this.instance = instance;
+        Path(Tree tree, String textual, LinkedList<Node> nodes) {
+                this.tree = tree;
                 this.textual = textual;
                 this.nodes = nodes;
@@ -53 +53 @@
         public Path appendNode(Node node) {
                 assert isResolved();
-                return new PathBuilder().instance(instance).textual(textual + ((size() == 1) ? "" : "/") + node.getParam().getId()).add(nodes).add(node).finish();
+                return new PathBuilder().tree(tree).textual(textual + ((size() == 1) ? "" : "/") + node.getParam().getId()).add(nodes).add(node).finish();
         }
 
@@ -63 +63 @@
         public static class PathBuilder {
 
-                Instance instance;
+                Tree tree;
                 String textual;
                 final LinkedList<Node> nodes = new LinkedList<Node>();
 
                 public Path finish() {
-                        assert instance != null;
+                        assert tree != null;
                         assert textual != null;
-                        return new Path(instance, textual, nodes);
+                        return new Path(tree, textual, nodes);
                 }
 
@@ -77 +77 @@
                 }
 
-                public PathBuilder instance(Instance instance) {
-                        this.instance = instance;
+                public PathBuilder tree(Tree tree) {
+                        this.tree = tree;
                         return this;
                 }
@@ -130 +130 @@
                 }
 
-                public PathBuilder resolve(@Nonnull Instance instance, String textual) {
+                public PathBuilder resolve(@Nonnull Tree tree, String textual) {
 
                         assert nodes.isEmpty();
-                        assert instance.isActive();
-                        this.instance = instance;
-
-                        nodes.add(instance.getRoot());
-                        Node current = instance.getRoot();
+                        assert tree.isActive();
+                        this.tree = tree;
+
+                        nodes.add(tree.getRoot());
+                        Node current = tree.getRoot();
 
                         StringBuilder b = new StringBuilder();
                         Iterator<String> i = splitPath(textual);
                         while (i.hasNext() && current.getObject() != null) {
-                                AccessInterface access = instance.prepareAccess(current.getParam());
+                                AccessInterface access = tree.prepareAccess(current.getParam());
                                 if (access == null) {
                                         break;
@@ -155 +155 @@
                                 b.append("/").append(e);
                                 access.select(current.getObject());
-                                current = new Node(c, getKnownChild(instance, access, c));
+                                current = new Node(c, getKnownChild(tree, access, c));
                                 nodes.add(current);
                         }
@@ -170 +170 @@
         public Path appendResolution(Object object) {
                 assert !isResolved();
-                Path result = new PathBuilder().textual(textual).instance(instance).add(nodes).setLast(object).finish();
+                Path result = new PathBuilder().textual(textual).tree(tree).add(nodes).setLast(object).finish();
                 assert size() == result.size();
                 return result;
@@ -193 +193 @@
 
         public String toString() {
-                return instance + textual + (!isResolved() ? "!" : "");
+                return tree + textual + (!isResolved() ? "!" : "");
+        }
+
+        public String getFullTextual() {
+                return tree.getName() + textual;
         }
 
@@ -216 +220 @@
         }
 
-        public final @Nonnull Instance getInstance() {
-                assert Dispatching.isThreadSafe();
-                return instance;
+        public final @Nonnull Tree getTree() {
+                assert Dispatching.isThreadSafe();
+                return tree;
         }
 
@@ -233 +237 @@
          */
         public Path tryFindResolution() {
-                assert instance.isActive();
+                assert tree.isActive();
                 assert !isResolved();
                 if (size() == 1) {
-                        return Path.build().resolve(instance, "/").finish();//appendResolution(instance.root.object);
-                }
-                Object child = getKnownChild(instance, InstanceUtils.bindAccess(instance, getUnder()), getTop().getParam());
+                        return Path.build().resolve(tree, "/").finish();
+                }
+                Object child = getKnownChild(tree, TreeOperations.bindAccess(tree, getUnder()), getTop().getParam());
                 if (child == null) {
                         return this;
@@ -247 +251 @@
         public boolean matches(Path p) {
                 assert Dispatching.isThreadSafe();
-                assert instance == p.instance;
+                assert tree == p.tree;
                 Iterator<Node> a = nodes.iterator();
                 Iterator<Node> b = p.nodes.iterator();
@@ -264 +268 @@
         }
 
-        public final boolean isOwner(Instance instance) {
-                return this.instance == instance;
-        }
-
-        // public void setInstance(Instance instance) {
-        //      this.instance = instance;
-        // }
+        public final boolean isOwner(Tree tree) {
+                return this.tree == tree;
+        }
 
         @SuppressWarnings("unchecked")
@@ -284 +284 @@
         }
 
-        public static Path to(@Nonnull Instance instance, String textual) {
-                return Path.build().resolve(instance, textual).finish();
+        public static Path to(@Nonnull Tree tree, String textual) {
+                return Path.build().resolve(tree, textual).finish();
         }
 }