Changeset 97 for java/main/src/main/java/com/framsticks/gui/Browser.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/gui/Browser.java (modified) (10 diffs)

java/main/src/main/java/com/framsticks/gui/Browser.java

@@ -2 +2 @@
 
 import com.framsticks.core.*;
+import com.framsticks.gui.console.Console;
+import com.framsticks.gui.console.TrackConsole;
 import com.framsticks.params.annotations.AutoAppendAnnotation;
 import com.framsticks.params.annotations.FramsClassAnnotation;
 import com.framsticks.params.annotations.ParamAnnotation;
+import com.framsticks.remote.RemoteTree;
+import com.framsticks.util.FramsticksException;
 import com.framsticks.util.dispatching.AbstractJoinable;
 import com.framsticks.util.dispatching.Dispatcher;
 import com.framsticks.util.dispatching.Dispatching;
+import com.framsticks.util.dispatching.ExceptionResultHandler;
 import com.framsticks.util.dispatching.Future;
+import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.Joinable;
 import com.framsticks.util.dispatching.JoinableCollection;
@@ -19 +25 @@
 
 import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import com.framsticks.util.dispatching.RunAt;
@@ -27 +37 @@
  */
 @FramsClassAnnotation
-public class Browser extends AbstractJoinable implements Dispatcher<Browser>, JoinableParent {
-
-        private static final Logger log = Logger.getLogger(Browser.class.getName());
-
-        protected JoinableCollection<Frame> frames = new JoinableCollection<Frame>().setObservableName("frames");
-        protected JoinableCollection<Instance> instances = new JoinableCollection<Instance>().setObservableName("instances");
-
-        protected MainFrame mainFrame;
-        public List<PanelProvider> panelProviders = new ArrayList<PanelProvider>();
+public class Browser extends AbstractJoinable implements Dispatcher<Browser>, JoinableParent, ExceptionResultHandler {
+
+        private static final Logger log = Logger.getLogger(Browser.class);
+
+        protected final JoinableCollection<Frame> frames = new JoinableCollection<Frame>().setObservableName("frames");
+        protected final JoinableCollection<Tree> trees = new JoinableCollection<Tree>().setObservableName("trees");
+        protected final JoinableCollection<Console> consoles = new JoinableCollection<Console>().setObservableName("consoles");
+
+        protected final List<PopupMenuEntryProvider> popupMenuEntryProviders = new LinkedList<>();
+
+        protected final MainFrame mainFrame;
+        protected final List<PanelProvider> panelProviders = new ArrayList<PanelProvider>();
         protected Dimension defaultFrameDimension;
 
@@ -51 +64 @@
                 mainFrame = new MainFrame(Browser.this);
                 addFrame(mainFrame);
+
+                addPopupMenuEntryProvider(new PopupMenuEntryProvider() {
+                        @Override
+                        public void provide(JPopupMenu menu, Path path) {
+                                menu.add(new JMenuItem(path.getFullTextual()));
+                                menu.addSeparator();
+                        }
+                });
+
+                addPopupMenuEntryProvider(new PopupMenuEntryProvider() {
+                        @SuppressWarnings("serial")
+                        @Override
+                        public void provide(JPopupMenu menu, final Path path) {
+                                menu.add(new AbstractAction("Copy path to clipboard") {
+                                        @Override
+                                        public void actionPerformed(ActionEvent e) {
+                                                Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(path.getFullTextual()), null);
+                                        }
+                                });
+                        }
+                });
+
+                addPopupMenuEntryProvider(new PopupMenuEntryProvider() {
+                        @SuppressWarnings("serial")
+                        @Override
+                        public void provide(JPopupMenu menu, final Path path) {
+                                if (!(path.getTree() instanceof RemoteTree)) {
+                                        return;
+                                }
+                                final RemoteTree remoteTree = (RemoteTree) path.getTree();
+                                menu.add(new AbstractAction("Open tracking console") {
+                                        @Override
+                                        public void actionPerformed(ActionEvent e) {
+                                                consoles.add(new TrackConsole().setConnection(remoteTree.getConnection()));
+                                        }
+                                });
+                        }
+                });
+                // addNodeActionToTreePopupMenu("", new NodeAction() )
+
         }
 
@@ -60 +113 @@
 
         @AutoAppendAnnotation
-        public void addInstance(Instance instance) {
-                log.info("adding instance: " + instance);
-                instances.add(instance);
+        public void addPopupMenuEntryProvider(PopupMenuEntryProvider popupMenuEntryProvider) {
+                popupMenuEntryProviders.add(popupMenuEntryProvider);
+        }
+
+        @AutoAppendAnnotation
+        public void addTree(Tree tree) {
+                log.info("adding tree: " + tree);
+                trees.add(tree);
         }
 
         public void autoResolvePath(final String path, final Future<Path> future) {
-                final Instance i = instances.get("localhost");
-                i.dispatch(new RunAt<Instance>() {
-                        @Override
-                        public void run() {
-                                InstanceUtils.resolveAndFetch(i, path, new Future<Path>(future) {
+                final Tree i = trees.get("localhost");
+                i.dispatch(new RunAt<Tree>(future) {
+                        @Override
+                        protected void runAt() {
+                                TreeOperations.resolveAndGet(i, path, new FutureHandler<Path>(future) {
                                         @Override
                                         protected void result(final Path p) {
                                                 future.pass(p);
-                                                mainFrame.dispatch(new RunAt<Frame>() {
+                                                mainFrame.dispatch(new RunAt<Frame>(future) {
                                                         @Override
-                                                        public void run() {
+                                                        protected void runAt() {
                                                                 mainFrame.goTo(p);
                                                         }
@@ -93 +151 @@
         }
 
-        protected void initializeGUI() {
-                assert isActive();
-                log.debug("executing first task");
-
-                try {
-                        boolean found = false;
-                        // for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
-                        //      log.info("look and feel available: " + info.getName());
-                        //      if ("Nimbus".equals(info.getName())) {
-                        //              UIManager.setLookAndFeel(info.getClassName());
-                        //              found = true;
-                        //              break;
-                        //      }
-                        // }
-                        if (!found) {
-                                UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-                        }
-                } catch (Exception ex) {
-                        log.warn("failed loading Look&Feel: ", ex);
-                }
-
-                javax.swing.JFrame.setDefaultLookAndFeelDecorated(true);
-
-
-                for (Frame f : frames) {
-                        f.configure();
-                }
-
-                for (final Instance i : instances) {
-                        i.dispatch(new RunAt<Instance>() {
-                                @Override
-                                public void run() {
-                                        final Path p = Path.to(i, "/");
-                                        dispatch(new RunAt<Browser>() {
-                                                @Override
-                                                public void run() {
-                                                        mainFrame.addRootPath(p);
-                                                }
-                                        });
-                                }
-                        });
-                }
-
-                for (Frame f : frames) {
-                        f.getSwing().setVisible(true);
-                }
-
-                // autoResolvePath("/simulator/genepools/groups/0", null);
-                // autoResolvePath("/", null);
-        }
-
         public void createTreeNodeForChild(final Path path) {
                 assert !isActive();
-                //assert instance.isActive();
+                //assert tree.isActive();
 
                 /*
@@ -174 +181 @@
         protected void joinableStart() {
                 Dispatching.use(frames, this);
-                Dispatching.use(instances, this);
-
-                dispatch(new RunAt<Browser>() {
-                        @Override
-                        public void run() {
-                                initializeGUI();
-                        }
-                });
-        }
-
-        /**
-         * @return the instances
-         */
-        public JoinableCollection<Instance> getInstances() {
-                return instances;
+                Dispatching.use(trees, this);
+                Dispatching.use(consoles, this);
+
+                dispatch(new RunAt<Browser>(this) {
+                        @Override
+                        protected void runAt() {
+
+                                for (final Tree i : trees) {
+                                        i.dispatch(new RunAt<Tree>(this) {
+                                                @Override
+                                                protected void runAt() {
+                                                        final Path p = Path.to(i, "/");
+                                                        dispatch(new RunAt<Browser>(this) {
+                                                                @Override
+                                                                protected void runAt() {
+                                                                        mainFrame.addRootPath(p);
+                                                                }
+                                                        });
+                                                }
+                                        });
+                                }
+                        }
+                });
+        }
+
+        /**
+         * @return the tree
+         */
+        public JoinableCollection<Tree> getTrees() {
+                return trees;
         }
 
@@ -227 +249 @@
         protected void joinableJoin() throws InterruptedException {
                 Dispatching.join(frames);
-                Dispatching.join(instances);
+                Dispatching.join(trees);
+                Dispatching.join(consoles);
                 // super.join();
         }
@@ -233 +256 @@
         @Override
         protected void joinableInterrupt() {
+                Dispatching.drop(consoles, this);
                 Dispatching.drop(frames, this);
-                Dispatching.drop(instances, this);
+                Dispatching.drop(trees, this);
         }
 
@@ -255 +279 @@
         }
 
+        @Override
+        public void handle(FramsticksException exception) {
+                mainFrame.handle(exception);
+        }
 
         // @Override
         // public boolean isDone() {
-        //      return frames.isDone() && instances.isDone();
+        //      return frames.isDone() && trees.isDone();
         // }
 }