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

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

@@ -1 +1 @@
 package com.framsticks.gui;
 
-import com.framsticks.gui.windows.console.ConsoleFrame;
-import com.framsticks.util.swing.MenuConstructor;
-import org.apache.log4j.Logger;
-
-import javax.swing.*;
-import javax.swing.border.TitledBorder;
-import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.KeyStroke;
+import javax.swing.WindowConstants;
+
+import org.apache.log4j.Logger;
+
+import com.framsticks.util.swing.MenuConstructor;
 
 /**
@@ -28 +29 @@
          */
         public MainFrame(final Browser browser) {
-                super("framsticks", browser);
+                super(browser);
+                setTitle("framsticks");
                 log.debug("creating main frame");
 
@@ -35 +37 @@
 
         @Override
-        public void configure() {
-                super.configure();
+        protected void initializeGui() {
+                super.initializeGui();
 
                 new MenuConstructor(fileMenu)
@@ -42 +44 @@
                                 @Override
                                 public void actionPerformed(ActionEvent actionEvent) {
-                                        showConsoleFrame();
+                                        // showConsoleFrame();
                                 }
                         })
@@ -145 +147 @@
         // }
 
-        public void setSimulationRunning(final boolean run) {
-                assert isActive();
-                /*
-                remoteInstance.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                                remoteInstance.setRunning(run);
-                        }
-                });
-                */
-        }
-
-        /**
-         * Creates panel with start, step, stop buttons.
-         */
-        @Override
-        protected JPanel createLeftTopPanel() {
-                assert isActive();
-                Dimension buttonDimension = new Dimension(45, 45);
-
-                JPanel panel = new JPanel();
-
-                stop = new JButton(ImageProvider.loadImage(ImageProvider.SIM_STOP));
-                stop.addActionListener(new ActionListener() {
-
-                        public void actionPerformed(ActionEvent e) {
-                                setSimulationRunning(false);
-                        }
-
-                });
-
-                stop.setPreferredSize(buttonDimension);
-                stop.setToolTipText("Simulation Stop");
-                stop.setEnabled(false);
-
-                step = new JButton(ImageProvider.loadImage(ImageProvider.SIM_STEP));
-                /*
-                step.addActionListener(new ActionListener() {
-
-                        public void actionPerformed(ActionEvent e) {
-                                connection.send(new CallQuery().setMethod("step").setPath("/simulator"));
-                        }
-
-                });
-                */
-
-                step.setPreferredSize(buttonDimension);
-                step.setToolTipText("Simulation Step");
-
-                start = new JButton(ImageProvider.loadImage(ImageProvider.SIM_START));
-                start.addActionListener(new ActionListener() {
-
-                        public void actionPerformed(ActionEvent e) {
-                                setSimulationRunning(true);
-                        }
-
-                });
-
-                start.setPreferredSize(buttonDimension);
-                start.setToolTipText("Start Simulation");
-
-                JPanel buttonPanel = new JPanel();
-                buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
-                buttonPanel.add(Box.createHorizontalStrut(5));
-                buttonPanel.add(stop);
-                buttonPanel.add(Box.createHorizontalStrut(10));
-                buttonPanel.add(step);
-                buttonPanel.add(Box.createHorizontalStrut(10));
-                buttonPanel.add(start);
-                buttonPanel.add(Box.createHorizontalStrut(5));
-
-                buttonPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory
-                                .createRaisedBevelBorder(), "Simulation Control",
-                                TitledBorder.CENTER, TitledBorder.DEFAULT_POSITION
-                                ));
-
-                panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
-                panel.add(Box.createHorizontalGlue());
-                panel.add(buttonPanel);
-                panel.add(Box.createHorizontalGlue());
-                return panel;
-        }
+
+        // /**
+        //  * Creates panel with start, step, stop buttons.
+        //  */
+        // @Override
+        // protected JPanel createLeftTopPanel() {
+        //      assert isActive();
+        //      Dimension buttonDimension = new Dimension(45, 45);
+
+        //      JPanel panel = new JPanel();
+
+        //      stop = new JButton(ImageProvider.loadImage(ImageProvider.SIM_STOP));
+        //      stop.addActionListener(new ActionListener() {
+
+        //              public void actionPerformed(ActionEvent e) {
+        //                      setSimulationRunning(false);
+        //              }
+
+        //      });
+
+        //      stop.setPreferredSize(buttonDimension);
+        //      stop.setToolTipText("Simulation Stop");
+        //      stop.setEnabled(false);
+
+        //      step = new JButton(ImageProvider.loadImage(ImageProvider.SIM_STEP));
+        //      /*
+        //      step.addActionListener(new ActionListener() {
+
+        //              public void actionPerformed(ActionEvent e) {
+        //                      connection.send(new CallQuery().setMethod("step").setPath("/simulator"));
+        //              }
+
+        //      });
+        //      */
+
+        //      step.setPreferredSize(buttonDimension);
+        //      step.setToolTipText("Simulation Step");
+
+        //      start = new JButton(ImageProvider.loadImage(ImageProvider.SIM_START));
+        //      start.addActionListener(new ActionListener() {
+
+        //              public void actionPerformed(ActionEvent e) {
+        //                      setSimulationRunning(true);
+        //              }
+
+        //      });
+
+        //      start.setPreferredSize(buttonDimension);
+        //      start.setToolTipText("Start Simulation");
+
+        //      JPanel buttonPanel = new JPanel();
+        //      buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
+        //      buttonPanel.add(Box.createHorizontalStrut(5));
+        //      buttonPanel.add(stop);
+        //      buttonPanel.add(Box.createHorizontalStrut(10));
+        //      buttonPanel.add(step);
+        //      buttonPanel.add(Box.createHorizontalStrut(10));
+        //      buttonPanel.add(start);
+        //      buttonPanel.add(Box.createHorizontalStrut(5));
+
+        //      buttonPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory
+        //                      .createRaisedBevelBorder(), "Simulation Control",
+        //                      TitledBorder.CENTER, TitledBorder.DEFAULT_POSITION
+        //                      ));
+
+        //      panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
+        //      panel.add(Box.createHorizontalGlue());
+        //      panel.add(buttonPanel);
+        //      panel.add(Box.createHorizontalGlue());
+        //      return panel;
+        // }
 
         /**
@@ -233 +224 @@
         private void setFrameProperties() {
                 assert isActive();
-                swing.setMinimumSize(swing.getPreferredSize());
-                swing.setSize(swing.getPreferredSize());
-                swing.setMaximumSize(screenDimension);
-                swing.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-
-                swing.setIconImage(ImageProvider.loadImage(ImageProvider.LOGO)
+                getSwing().setMinimumSize(getSwing().getPreferredSize());
+                getSwing().setSize(getSwing().getPreferredSize());
+                getSwing().setMaximumSize(screenDimension);
+                getSwing().setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+
+                getSwing().setIconImage(ImageProvider.loadImage(ImageProvider.LOGO)
                                 .getImage());
 
 
-                swing.addWindowListener(new WindowAdapter() {
+                getSwing().addWindowListener(new WindowAdapter() {
                         public void windowClosing(WindowEvent e) {
                                 assert isActive();
@@ -251 +242 @@
                                 */
                                 onWindowClosing();
-                                swing.dispose();
+                                getSwing().dispose();
                         }
                 });
         }
 
-        public ConsoleFrame showConsoleFrame() {
-                assert isActive();
-                /*
-                ConsoleFrame consoleFrame = new ConsoleFrame(connection);
-                consoleFrame.show(MainFrame.this);
-                return consoleFrame;
-                */
-                return null;
-        }
+        // public ConsoleFrame showConsoleFrame() {
+        //      assert isActive();
+        //      /*
+        //      ConsoleFrame consoleFrame = new ConsoleFrame(connection);
+        //      consoleFrame.show(MainFrame.this);
+        //      return consoleFrame;
+        //      */
+        //      return null;
+        // }
 
         /**
@@ -271 +262 @@
         private void disconnect() {
                 assert isActive();
-                //remoteInstance.disconnect();
                 browser.clear();
                 onWindowClosing();
-                statusBar.setText("You are disconnected");
+                // statusBar.setText("You are disconnected");
         }