Changeset 84 for java/main/src/main/java/com/framsticks/gui/Browser.java

Timestamp:

06/22/13 21:51:33 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• simplification of entities management model
• cleanup around params (improve hierarchy)
• migrate from JUnit to TestNG
• introduce FEST to automatically test GUI
• improve slider control
• loosen synchronization between gui tree and backend representation
• and many other bug fixes

NOTICE:

• a great many of lines is changed only because of substituting spaces with tabs

CHANGELOG (oldest changes at the bottom):

Some cleaning after fix found.

Fix bug with tree.

More changes with TreeNodes?.

Finally fix issue with tree.

Improve gui tree management.

Decouple update of values from fetch request in gui.

Minor changes.

Minor changes.

Minor change.

Change Path construction wording.

More fixes to SliderControl?.

Fix SliderControl?.

Fix SliderControl?.

Minor improvement.

Several changes.

Make NumberParam? a generic class.

Add robot to the gui test.

Setup common testing logging configuration.

Remove Parameters class.

Remove entityOwner from Parameters.

Move name out from Parameters class.

Move configuration to after the construction.

Simplify observers and endpoints.

Remove superfluous configureEntity overrides.

Add dependency on fest-swing-testng.

Use FEST for final print test.

Use FEST for more concise and readable assertions.

Divide test of F0Parser into multiple methods.

Migrate to TestNG

Minor change.

Change convention from LOGGER to log.

Fix reporting of errors during controls filling.

Bound maximal height of SliderControl?.

Minor improvements.

Improve tooltips for controls.

Also use Delimeted in more places.

Move static control utilities to Gui.

Rename package gui.components to controls.

Some cleaning in controls.

Improve Param classes placing.

Move ValueParam?, PrimitiveParam? and CompositeParam? one package up.

Improve ParamBuilder?.

Move getDef to ValueParam? and PrimitiveParam?.

Move getMax and getDef to ValueParam?.

Move getMin to ValueParam?.

Upgrade to laters apache commons versions.

Use filterInstanceof extensively.

Add instanceof filters.

Make ValueParam? in many places of Param.

Place assertions about ValueParam?.

Add ValueParam?

Rename ValueParam? to PrimitiveParam?

Minor changes.

Several improvements to params types.

Add NumberParam?.

Add TextControl? component.

Add .swp files to .gitignore

Greatly improved slider component.

Some improvements.

Make Param.reassign return also a state.

Add IterableIterator?.

Several changes.

• Move util classes to better packages.
• Remove warnings from eclim.

Several improvements.

Fix bug with BooleanParam?.

Some experiments with visualization.

Another fix to panel management.

Improve panel management.

Some refactorization around panels.

Add root class for panel.

Location:

java/main

Files:

• . (modified) (1 prop)
• src/main/java/com/framsticks/gui/Browser.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import com.framsticks.observers.Endpoint;
 import com.framsticks.observers.Observer;
-import com.framsticks.util.Dispatcher;
+import com.framsticks.util.Logging;
+import com.framsticks.util.dispatching.Dispatcher;
+import com.framsticks.util.dispatching.Future;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
 
 import javax.swing.*;
+
+import java.awt.Dimension;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
@@ -16 +25 @@
 public class Browser extends Observer implements Dispatcher {
 
-    private static final Logger LOGGER = Logger.getLogger(Browser.class.getName());
-
-    protected final Set<Frame> frames = new HashSet<Frame>();
-    protected MainFrame mainFrame;
-
-    public void addFrame(Frame frame) {
-        frames.add(frame);
-    }
-
-        public Browser(Parameters parameters) {
-        super(parameters);
-        dispatcher = SwingDispatcher.instance;
-        invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                assert isActive();
-
-            }
-        });
+        private static final Logger log = Logger.getLogger(Browser.class.getName());
+
+        protected final Set<Frame> frames = new HashSet<Frame>();
+        protected MainFrame mainFrame;
+        public List<PanelProvider> panelProviders = new ArrayList<PanelProvider>();
+        protected Dimension defaultFrameDimension;
+
+        public void addFrame(Frame frame) {
+                frames.add(frame);
+        }
+
+        public Browser() {
+                JPopupMenu.setDefaultLightWeightPopupEnabled(false);
+                addPanelProvider(new StandardPanelProvider());
+        }
+
+        @Override
+        public void configure(Configuration config) {
+                super.configure(config);
+
+                defaultFrameDimension = new Dimension(config.getInteger("size.width", 1000), config.getInteger("size.height", 500));
+
+                for (String name : config.getStringArray("panel_providers")) {
+                        try {
+                                Class<?> c = Class.forName(name);
+                                if (ArrayUtils.indexOf(c.getInterfaces(), PanelProvider.class) == -1) {
+                                        continue;
+                                }
+                                PanelProvider p = (PanelProvider)c.newInstance();
+                                addPanelProvider(p);
+                        } catch (Exception e) {
+                                log.error("failed to load PanelProvider " + name + ": " + e);
+                        }
+                }
+
+                // for (final String path : config.getStringArray("resolve_paths")) {
+                //      invokeLater()
+                //      autoResolvePath(path, new Future<Path>() {
+                //              @Override
+                //              public void result(Path p, Exception e) {
+                //                      Logging.log(log, "auto resolve path", path, e);
+                //              }
+                //      });
+                // }
+        }
+
+        public void addPanelProvider(PanelProvider panelProvider) {
+                log.debug("added panel provider of type: " + panelProvider.getClass().getCanonicalName());
+                panelProviders.add(panelProvider);
+        }
+
+        public void autoResolvePath(final String path, final Future<Path> future) {
+                final Instance i = endpoints.get("localhost").getInstance();
+                i.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                                i.resolveAndFetch(path, new Future<Path>() {
+                                        @Override
+                                        public void result(final Path p, Exception e) {
+                                                Logging.log(log, "auto resolve path", path, e);
+                                                if (future != null) {
+                                                        future.result(p, e);
+                                                }
+                                                if (e == null) {
+                                                        mainFrame.invokeLater(new Runnable() {
+                                                                @Override
+                                                                public void run() {
+                                                                        mainFrame.goTo(p);
+                                                                }
+                                                        });
+                                                }
+                                        }
+                                });
+                        }
+                });
         }
 
         public void clear() {
-        assert isActive();
-        for (Frame f : frames) {
-            f.clear();
-        }
-        }
-
-    @Override
-    protected void configure() throws Exception {
-        super.configure();
-    }
-
-
-    @Override
-    public void run() {
-        super.run();
-
-        try {
-            UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-        } catch (Exception ex) {
-            LOGGER.warn("failed loading Look&Feel: ", ex);
-        }
-        javax.swing.JFrame.setDefaultLookAndFeelDecorated(true);
-
-        mainFrame = new MainFrame(Browser.this);
-        addFrame(mainFrame);
-
-        for (Frame f : frames) {
-            f.configure();
-        }
-
-        for (final Endpoint e : getEndpoints().values()) {
-            e.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    final Path p = new Path(e.getInstance(), "/");
-                    invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            mainFrame.addRootPath((BrowserEndpoint) e, p);
-                        }
-                    });
-                }
-            });
-
-        }
-
-        for (Frame f : frames) {
-            f.setVisible(true);
-        }
-    }
-
-    public void createTreeNodeForChild(final Path path) {
-        assert !isActive();
-        //assert instance.isActive();
+                assert isActive();
+                for (Frame f : frames) {
+                        f.clear();
+                }
+        }
+
+        @Override
+        public void run() {
+                super.run();
+
+                assert isActive();
+
+                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);
+
+                mainFrame = new MainFrame(Browser.this);
+                addFrame(mainFrame);
+
+                for (Frame f : frames) {
+                        f.configure();
+                }
+
+                for (final Endpoint e : getEndpoints().values()) {
+                        e.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                        final Path p = e.getInstance().getRootPath();
+                                        invokeLater(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                        mainFrame.addRootPath((BrowserEndpoint) e, p);
+                                                }
+                                        });
+                                }
+                        });
+                }
+
+                for (Frame f : frames) {
+                        f.setVisible(true);
+                }
+
+                // autoResolvePath("/simulator/genepools/groups/0", null);
+                // autoResolvePath("/", null);
+        }
+
+        public void createTreeNodeForChild(final Path path) {
+                assert !isActive();
+                //assert instance.isActive();
 
 
 /*
-        final TreeNode parentTreeNode = (TreeNode) child.getParent().getUserObject();
-        if (parentTreeNode == null) {
-            Dispatching.invokeDispatch(this, manager, new Runnable() {
-                @Override
-                public void run() {
-                    createTreeNodeForChild(child);
-                }
-            });
-            return;
-        }
-        LOGGER.debug(child.getClass().getSimpleName() + " created: " + child);
-
-
-        invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                parentTreeNode.getOrCreateChildTreeNodeFor(child);
-            }
-        });
+                final TreeNode parentTreeNode = (TreeNode) child.getParent().getUserObject();
+                if (parentTreeNode == null) {
+                        Dispatching.invokeDispatch(this, manager, new Runnable() {
+                                @Override
+                                public void run() {
+                                        createTreeNodeForChild(child);
+                                }
+                        });
+                        return;
+                }
+                log.debug(child.getClass().getSimpleName() + " created: " + child);
+
+
+                invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                                parentTreeNode.getOrCreateChildTreeNodeFor(child);
+                        }
+                });
 */
         }
 
 
-    @Override
-    protected Endpoint createEndpoint() {
-        return new BrowserEndpoint();
-    }
+        @Override
+        protected Endpoint createEndpoint() {
+                return new BrowserEndpoint();
+        }
+
+        @Override
+        public Dispatcher createDefaultDispatcher() {
+                return SwingDispatcher.instance;
+        }
+
+        /**
+         * @return the mainFrame
+         */
+        public MainFrame getMainFrame() {
+                return mainFrame;
+        }
 
 }