Changeset 101 for java/main/src/main/java/com/framsticks/gui

Timestamp:

07/14/13 23:20:04 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• improve tree side notes
• improve GUI layout
• add foldable list of occured events to EventControl?
• improve automatic type conversion in proxy listeners
• implement several Access functionalities as algorithms independent of Access type
• introduce draft base classes for distributed experiments
• automatically register dependant Java classes to FramsClass? registry
• add testing prime experiment and configuration
• simplify and improve task dispatching

CHANGELOG:
Improve task dispatching in RemoteTree?.

GUI no longer hangs on connection problems.

Make all dispatchers joinables.

Refactorize Thread dispatcher.

Remove Task and PeriodicTask?.

Use Java utilities in those situations.

Reworking tasks dispatching.

Fix bug in EventControl? listener dispatching.

Minor improvements.

Add testing configuration for ExternalProcess? in GUI.

More improvement to prime.

Support for USERREADONLY in GUI.

Add that flag to various params in Java classes.

Remove redundant register clauses from several FramsClassAnnotations?.

Automatically gather and register dependant classes.

Add configuration for prime.

Improve Simulator class.

Add prime.xml configuration.

Introduce draft Experiment and Simulator classes.

Add prime experiment tests.

Enclose typical map with listeners into SimpleUniqueList?.

Needfile works in GUI.

Improve needfile handling in Browser.

More improvement with NeedFile?.

Implementing needfile.

Update test.

Rename ChangeEvent? to TestChangeEvent?.

Automatic argument type search in RemoteTree? listeners.

MultiParamLoader? uses AccessProvider?. By default old implementation
enclosed in AccessStash? or Registry.

Minor changes.

Rename SourceInterface? to Source.

Also improve toString of File and ListSource?.

Remove unused SimpleSource? class.

Add clearing in HistoryControl?.

Show entries in table at EventControl?.

Improve EventControl?.

Add listeners registration to EventControl?.

Add foldable table to HistoryControl?.

Add control row to Procedure and Event controls.

Improve layout of controls.

Another minor change to gui layout.

Minor improvement in the SliderControl?.

Minor changes.

Move ReflectionAccess?.Backend to separate file.

It was to cluttered.

Cleanup in ReflectionAccess?.

Move setMin, setMax, setDef to AccessOperations?.

Extract loading operation into AccessOperations?.

Append Framsticks to name of UnsupportedOperationException?.

The java.lang.UnsupportedOperationException? was shadowing this class.

Rename params.Util to params.ParamsUtil?.

Several improvements.

• Merge ValueControlListener? into ControlOwner?.
• Remove several deprecated utility classes.
• Add EventListeners? utility container.

Minor changes.

Implement revert functionality.

Improve local changes management.

Minor improvement.

Remove methods rendered superfluous after SideNoteKey? improvement.

Improve SideNoteKey?.

It is now generic type, so explicit type specification at
call site is no more needed.

Introduce SideNoteKey? interface.

Only Objects implementing that key may be used as side note keys.

Minor improvements.

Use strings instead of ValueControls? in several gui mappings.

Location:

java/main/src/main/java/com/framsticks/gui

Files:

• Browser.java (modified) (7 diffs)
• Frame.java (modified) (2 diffs)
• FrameJoinable.java (modified) (3 diffs)
• Gui.java (modified) (4 diffs)
• MainFrame.java (modified) (2 diffs)
• ModifiablePanel.java (modified) (7 diffs)
• NodeAtFrame.java (deleted)
• ObjectPanel.java (modified) (8 diffs)
• StatusBar.java (modified) (3 diffs)
• SwingDispatcher.java (modified) (4 diffs)
• TreeAtFrame.java (modified) (5 diffs)
• TreePanel.java (modified) (3 diffs)
• UserChanges.java (added)
• controls/CheckBoxControl.java (modified) (2 diffs)
• controls/Control.java (modified) (3 diffs)
• controls/ControlOwner.java (modified) (2 diffs)
• controls/EnumControl.java (modified) (2 diffs)
• controls/EventControl.java (modified) (2 diffs)
• controls/HistoryControl.java (added)
• controls/ProcedureControl.java (modified) (8 diffs)
• controls/SliderControl.java (modified) (4 diffs)
• controls/TextAreaControl.java (modified) (2 diffs)
• controls/TextFieldControl.java (modified) (2 diffs)
• controls/ValueControl.java (modified) (4 diffs)
• controls/ValueControlListener.java (deleted)
• table/AbstractTableModel.java (added)
• table/ListPanel.java (modified) (3 diffs)
• table/PrimitiveColumn.java (modified) (2 diffs)
• table/TableModel.java (modified) (6 diffs)
• tree/TreeModel.java (modified) (5 diffs)
• tree/TreeNode.java (modified) (5 diffs)

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

@@ -1 +1 @@
 package com.framsticks.gui;
 
+import com.framsticks.communication.File;
+import com.framsticks.communication.queries.NeedFile;
+import com.framsticks.communication.queries.NeedFileAcceptor;
 import com.framsticks.core.*;
 import com.framsticks.gui.console.Console;
@@ -9 +12 @@
 import com.framsticks.params.annotations.FramsClassAnnotation;
 import com.framsticks.params.annotations.ParamAnnotation;
+import com.framsticks.parsers.FileSource;
 import com.framsticks.remote.RemoteTree;
 import com.framsticks.util.FramsticksException;
@@ -22 +26 @@
 
 import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
 
 import org.apache.logging.log4j.Logger;
@@ -30 +35 @@
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import com.framsticks.util.dispatching.RunAt;
+import com.framsticks.util.lang.Strings;
 
 /**
@@ -132 +145 @@
         }
 
+        protected static final Pattern extensionFilterPattern = Pattern.compile("\\*\\.(\\S+)");
+
         @AutoAppendAnnotation
-        public void addTree(Tree tree) {
+        public void addTree(final Tree tree) {
                 log.debug("adding tree: {}", tree);
                 tree.setDispatcher(new SwingDispatcher<Tree>());
                 tree.setExceptionHandler(this);
                 trees.add(tree);
+
+                final NeedFileAcceptor acceptor = new NeedFileAcceptor() {
+
+                        protected boolean done = false;
+
+                        @Override
+                        public boolean acceptNeed(final NeedFile needFile) {
+                                final JFileChooser chooser = new JFileChooser();
+                                final JFrame frame = new JFrame();
+
+                                frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+
+                                frame.addWindowListener(new WindowAdapter() {
+                                        @Override
+                                        public void windowClosing(WindowEvent e) {
+                                                if (!done) {
+                                                        needFile.getFuture().handle(new FramsticksException().msg("user closed the window"));
+                                                }
+                                                frame.setVisible(false);
+                                                frame.dispose();
+                                        }
+                                });
+
+                                frame.setTitle(Strings.toStringEmptyProof(needFile.getDescription(), "Choose file"));
+                                chooser.setMultiSelectionEnabled(false);
+                                Matcher matcher = extensionFilterPattern.matcher(needFile.getSuggestedName());
+                                if (matcher.matches()) {
+                                        chooser.setFileFilter(new FileNameExtensionFilter(Strings.toStringEmptyProof(needFile.getDescription(), "file"), Strings.takeGroup(needFile.getSuggestedName(), matcher, 1).toString()));
+                                }
+
+                                frame.getContentPane().add(chooser);
+
+                                chooser.addActionListener(new ActionListener() {
+
+                                        @Override
+                                        public void actionPerformed(ActionEvent event) {
+                                                if (event.getActionCommand().equals("CancelSelection")) {
+                                                        needFile.getFuture().handle(new FramsticksException().msg("user cancelled choose"));
+                                                        frame.setVisible(false);
+                                                        frame.dispose();
+                                                }
+                                                if (event.getActionCommand().equals("ApproveSelection")) {
+                                                        File file = null;
+                                                        String filename = chooser.getSelectedFile().getAbsolutePath();
+                                                        try {
+                                                                file = new File("", new FileSource(filename));
+                                                        } catch (IOException e) {
+                                                                needFile.getFuture().handle(new FramsticksException().msg("failed to open choosed file").arg("filename", filename).cause(e));
+                                                        }
+                                                        if (file != null) {
+                                                                done = true;
+                                                                needFile.getFuture().pass(file);
+                                                        }
+                                                        frame.setVisible(false);
+                                                        frame.dispose();
+                                                }
+                                        }
+                                });
+                                frame.setVisible(true);
+                                return true;
+                        }
+                };
+
+                tree.dispatch(new RunAt<Tree>(this) {
+                        @Override
+                        protected void runAt() {
+                                log.debug("adding need file acceptor: {}", acceptor);
+                                tree.addNeedFileAcceptor(Integer.MAX_VALUE, acceptor);
+                        }
+                });
+
         }
 
@@ -143 +229 @@
                 // final Tree i = trees.get("localhost");
                 // i.dispatch(new RunAt<Tree>(future) {
-                //      @Override
-                //      protected void runAt() {
-                //              TreeOperations.tryGet(i, path, new FutureHandler<Path>(future) {
-                //                      @Override
-                //                      protected void result(final Path p) {
-                //                              future.pass(p);
-                //                              mainFrame.dispatch(new RunAt<Frame>(future) {
-                //                                      @Override
-                //                                      protected void runAt() {
-                //                                              mainFrame.goTo(p);
-                //                                      }
-                //                              });
-                //                      }
-                //              });
-                //      }
+                //      @Override
+                //      protected void runAt() {
+                //              TreeOperations.tryGet(i, path, new FutureHandler<Path>(future) {
+                //                      @Override
+                //                      protected void result(final Path p) {
+                //                              future.pass(p);
+                //                              mainFrame.dispatch(new RunAt<Frame>(future) {
+                //                                      @Override
+                //                                      protected void runAt() {
+                //                                              mainFrame.goTo(p);
+                //                                      }
+                //                              });
+                //                      }
+                //              });
+                //      }
                 // });
         }
@@ -183 +269 @@
                                                 protected void runAt() {
                                                         final Path p = Path.to(i, "/");
+                                                        log.debug("adding path: {}", p);
                                                         dispatch(new RunAt<Browser>(this) {
                                                                 @Override

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

@@ -243 +243 @@
                         @Override
                         public void actionPerformed(ActionEvent actionEvent) {
-                                interrupt();
+                                interruptJoinable();
                         }
                 });
@@ -268 +268 @@
                 log.debug("trying mount: {}", path);
                 if (!tree.getAssignedRoot().isResolved()) {
+                        log.debug("root not yet assigned, geting root");
                         tree.get(path, new FutureHandler<Path>(this) {
 

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

@@ -31 +31 @@
          */
         public FrameJoinable() {
-                statusBar = new StatusBar();
+                statusBar = new StatusBar(this);
         }
 
@@ -101 +101 @@
                         @Override
                         protected void runAt() {
-                                finish();
+                                finishJoinable();
                         }
                 });
@@ -135 +135 @@
                         public void windowClosing(WindowEvent e) {
                                 log.info("received closing");
-                                interrupt();
+                                interruptJoinable();
                         }
                 });

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

@@ -7 +7 @@
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
 
 import org.apache.logging.log4j.Logger;
@@ -24 +26 @@
 import com.framsticks.params.CompositeParam;
 import com.framsticks.params.Param;
+import com.framsticks.params.ParamFlags;
 import com.framsticks.params.PrimitiveParam;
 import com.framsticks.params.types.BinaryParam;
@@ -101 +104 @@
         }
 
-        public static <P extends Param, C extends Control> void fillWithControls(ControlOwner owner, Collection<P> params, Map<P, C> components, Class<C> controlType) {
-                JPanel panel = owner.getPanelForControls();
+        public static <P extends Param, C extends Control> void fillWithControls(ControlOwner owner, JPanel panel, Collection<P> params, Map<String, C> components, Class<C> controlType) {
+                panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
                 for (P param : params) {
-                        if (param.isUserHidden()) {
+                        if (param.hasFlag(ParamFlags.USERHIDDEN)) {
                                 continue;
                         }
@@ -122 +125 @@
                         line.setLayout(new BoxLayout(line, BoxLayout.LINE_AXIS));
                         line.setAlignmentX(JPanel.LEFT_ALIGNMENT);
-                        JLabel label = new JLabel(Strings.notEmpty(param.getName()) ? param.getName() : (Strings.notEmpty(param.getId()) ? param.getId() : "?"));
-                        label.setToolTipText(control.getToolTipText());
-                        label.setHorizontalAlignment(JLabel.RIGHT);
-                        Dimension labelSize = new Dimension(150, 30);
-                        label.setMaximumSize(labelSize);
-                        label.setMinimumSize(labelSize);
-                        label.setPreferredSize(labelSize);
-                        line.add(label);
-                        line.add(Box.createRigidArea(new Dimension(8, 0)));
+
                         line.add(control);
                         line.revalidate();
                         panel.add(line);
                         panel.add(Box.createRigidArea(new Dimension(0, 8)));
+                        components.put(param.getId(), control);
                         //component.setAlignmentX(LEFT_ALIGNMENT);
-                        components.put(param, control);
+                        // components.put(param.getId(), control);
                 }
 
         }
+
+        public static String getBestName(Param param) {
+                if (Strings.notEmpty(param.getName())) {
+                        return param.getName();
+                }
+                if (Strings.notEmpty(param.getId())) {
+                        return param.getId();
+                }
+                return "?";
+        }
+
+        public static void setupTitledControl(Control control, JComponent... components) {
+
+                control.setLayout(new BoxLayout(control, BoxLayout.PAGE_AXIS));
+                control.setBorder(new TitledBorder(Gui.getBestName(control.getParam())));
+                for (JComponent c : components) {
+                        // control.add(Box.createRigidArea(new Dimension(0, 4)));
+                        control.add(c);
+                }
+        }
+
+        public static void layoutInRow(JPanel panel, JComponent first, JComponent... components) {
+                panel.setLayout(new BoxLayout(panel, BoxLayout.LINE_AXIS));
+                panel.setAlignmentX(JPanel.LEFT_ALIGNMENT);
+
+                panel.add(first);
+                for (JComponent c : components) {
+                        panel.add(Box.createRigidArea(new Dimension(8, 0)));
+                        panel.add(c);
+                }
+        }
+
+        public static void addLeftToLabel(Control control, JComponent... components) {
+
+                JLabel label = new JLabel(getBestName(control.getParam()));
+                label.setToolTipText(control.getToolTipText());
+                label.setHorizontalAlignment(JLabel.LEFT);
+                Dimension labelSize = new Dimension(150, 30);
+                label.setMaximumSize(labelSize);
+                label.setMinimumSize(labelSize);
+                label.setPreferredSize(labelSize);
+
+                layoutInRow(control, label, components);
+
+        }
 }

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

@@ -73 +73 @@
         }
 
-        // private void onConnectionEstablished() {
-                // assert isActive();
-
-                // addNodeActionToTreePopupMenu("Open in console", new NodeAction() {
-                        // @Override
-                        // public void actionPerformed(TreeNode treeNode) {
-                                // assert isActive();
-                        // }
-                // });
-
-
-
-
-        //      // browser.addNodeActionToTreePopupMenu("Resolve recursively", new NodeAction() {
-        //      //      @Override
-        //      //      public void actionPerformed(TreeNode treeNode) {
-        //      //              final Child child = treeNode.getChild();
-        //      //              //server.invokeLater(new Runnable() {
-        //              //              @Override
-        //              //              public void run() {
-        //              //                      resolveRecursively(child);
-        //              //              }
-        //              //      });
-        //      // }
-        //      // });
-
-
-                // // addNodeActionToTreePopupMenu("Store in file", new NodeAction() {
-                // //     @Override
-                // //     public void actionPerformed(final TreeNode treeNode) {
-                // //         // final Node node = treeNode.getNode();
-                // //         // server.invokeLater(new Runnable() {
-                // //         //     @Override
-                // //         //     public void run() {
-                // //         //         try {
-                // //         //             log.info("storing");
-                // //         //             //File file = new File();
-                // //         //             StoreStream stream = new StoreStream(file, server.getManager());
-                // //         //             stream.store(node);
-                // //         //         } catch (FileNotFoundException e) {
-                // //         //             e.printStackTrace();
-                // //         //         }
-                // //         //     }
-                // //         // });
-                // //     }
-                // // });
-
-
-        //      // arguments.forEach("resolve", new UnaryFunctor<Boolean, String>() {
-        //      //      @Override
-        //      //      public Boolean call(final String s) {
-        //      //              server.getManager().resolvePath(s, new StateFunctor() {
-        //      //                      @Override
-        //      //                      public void call(Exception e) {
-        //      //                              if (e != null) {
-        //      //                                      log.error("failed to resolve: {}", s);
-        //      //                                      return;
-        //      //                              }
-        //      //                              log.info("succeeded to resolve: {}", s);
-        //      //                      }
-        //      //              });
-        //      //              return true;
-        //      //      }
-        //      // });
-
-
-        //      // arguments.forEach("console", new UnaryFunctor<Boolean, String>() {
-        //      //      @Override
-        //      //      public Boolean call(String s) {
-        //      //              showConsoleFrame().setCommandLine(s);
-        //      //              return true;
-        //      //      }
-        //      // });
-        // }
-
-
-        // /**
-        //  * 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;
-        // }
 
         /**
@@ -248 +102 @@
         }
 
-        // public ConsoleFrame showConsoleFrame() {
-        //      assert isActive();
-        //      /*
-        //      ConsoleFrame consoleFrame = new ConsoleFrame(connection);
-        //      consoleFrame.show(MainFrame.this);
-        //      return consoleFrame;
-        //      */
-        //      return null;
-        // }
-
         /**
          * Closes connection with manager.

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

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import static com.framsticks.core.TreeOperations.*;
 
 /**
@@ -24 +25 @@
         protected final JLabel label;
         protected final JButton applyButton;
+        protected final JButton revertButton;
         protected final JPanel centerPanel;
 
@@ -32 +34 @@
                 log.debug("create panel for type: {}", className);
 
-
-
                 JPanel pageEndPanel = new JPanel();
                 pageEndPanel.setLayout(new BoxLayout(pageEndPanel, BoxLayout.X_AXIS));
@@ -41 +41 @@
                 applyButton.setName("apply");
 
+                revertButton = new JButton("Revert");
+                revertButton.setName("revert");
+
+                pageEndPanel.add(applyButton);
+                pageEndPanel.add(Box.createHorizontalStrut(10));
+
+                pageEndPanel.add(revertButton);
+                pageEndPanel.add(Box.createHorizontalStrut(10));
+
+                pageEndPanel.setPreferredSize(new Dimension(0, 30));
+
                 applyButton.addActionListener(new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
@@ -46 +57 @@
                         }
                 });
-                pageEndPanel.add(applyButton);
 
-                pageEndPanel.add(Box.createHorizontalStrut(10));
-                pageEndPanel.setPreferredSize(new Dimension(0, 30));
+                revertButton.addActionListener(new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                                revertChanges();
+                        }
+                });
 
                 label = new JLabel();
@@ -67 +80 @@
 
         protected abstract void applyChanges();
+        protected abstract void revertChanges();
 
         protected void setupContentComponent(Component contentComponent) {
@@ -73 +87 @@
         }
 
+        protected void refreshControlButtons() {
+                assert frame.isActive();
+                boolean hasChanges = hasSideNotes(getTree(), getCurrentObject(), treeAtFrame.getUserChangesKey());
+                applyButton.setEnabled(hasChanges);
+                revertButton.setEnabled(hasChanges);
+        }
+
 }

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

@@ -5 +5 @@
 import com.framsticks.gui.controls.ControlOwner;
 import com.framsticks.gui.controls.ValueControl;
-import com.framsticks.gui.controls.ValueControlListener;
 import com.framsticks.params.Access;
 import com.framsticks.params.Param;
-import com.framsticks.params.ValueParam;
 
 import org.apache.logging.log4j.Logger;
@@ -16 +14 @@
 
 import java.util.Collection;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 import java.util.Map;
 import static com.framsticks.util.lang.Containers.filterInstanceof;
 
 import com.framsticks.util.FramsticksException;
+
+import static com.framsticks.core.TreeOperations.*;
 
 @SuppressWarnings("serial")
@@ -27 +27 @@
         private static final Logger log = LogManager.getLogger(ObjectPanel.class);
 
-        final protected Map<Param, Control> components = new IdentityHashMap<Param, Control>();
-        final protected Map<ValueParam, ValueControl> valueControls = new IdentityHashMap<ValueParam, ValueControl>();
+        final protected Map<String, Control> controls = new HashMap<String, Control>();
+        final protected Map<String, ValueControl> valueControls = new HashMap<String, ValueControl>();
 
         protected final JPanel contentPanel;
@@ -38 +38 @@
                 contentPanel = new JPanel();
                 scrollPane = new JScrollPane(contentPanel);
-                contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.PAGE_AXIS));
+
                 setupContentComponent(scrollPane);
 
-                Gui.fillWithControls(this, params, components, Control.class);
+                Gui.fillWithControls(this, contentPanel, params, controls, Control.class);
                 setName(framsClass.getId());
 
-                for (final ValueControl c : filterInstanceof(components.values(), ValueControl.class)) {
-                        valueControls.put(c.getParam(), c);
+                for (final ValueControl c : filterInstanceof(controls.values(), ValueControl.class)) {
+                        valueControls.put(c.getParam().getId(), c);
                         c.setUserEnabled(true);
-                        c.setListener(new ValueControlListener() {
-                                @Override
-                                public boolean onChange(Object newValue) {
-                                        if (currentPath == null) {
-                                                return true;
-                                        }
-                                        boolean result = treeAtFrame.changeValue(currentPath.assureResolved().getTopObject(), c, newValue);
-                                        refreshControlButtons();
-                                        return result;
-                                }
-                        });
                 }
 
@@ -68 +57 @@
                 assert frame.isActive();
                 assert currentPath != null;
-                treeAtFrame.pushLocalChanges(currentPath);
+                treeAtFrame.pushUserChangesToTree(currentPath);
+                refreshControlButtons();
         }
 
-        protected void refreshControlButtons() {
-                assert frame.isActive();
-                applyButton.setEnabled(treeAtFrame.hasLocalChanges(currentPath.getTopObject()));
+
+        @Override
+        protected void revertChanges() {
+                assert currentPath != null;
+                removeSideNote(currentPath, treeAtFrame.getUserChangesKey());
+                pullValuesFromLocalToUser(bindAccess(currentPath));
         }
 
@@ -81 +74 @@
                 log.debug("refreshing components");
 
-                final Map<ValueControl, Object> values = new IdentityHashMap<ValueControl, Object>();
-                for (Map.Entry<ValueParam, ValueControl> e : valueControls.entrySet()) {
-                        values.put(e.getValue(), access.get(e.getKey().getId(), Object.class));
+                UserChanges userChanges = getSideNote(currentPath, treeAtFrame.getUserChangesKey());
+
+
+                for (Map.Entry<String, ValueControl> e : valueControls.entrySet()) {
+                        String id = e.getKey();
+                        Object value;
+                        if (userChanges != null && userChanges.changes.containsKey(id)) {
+                                value = userChanges.changes.get(id);
+                        } else {
+                                value = access.get(id, Object.class);
+                        }
+
+                        e.getValue().pushValueToUserInterface(value);
                 }
 
-
-                NodeAtFrame nodeAtFrame = treeAtFrame.getLocalInfo(currentPath.getTopObject());
-                if (nodeAtFrame != null) {
-                        for (Map.Entry<ValueControl, Object> e : nodeAtFrame.localChanges.entrySet()) {
-                                values.put(e.getKey(), e.getValue());
-                        }
+                for (Map.Entry<String, Control> e : controls.entrySet()) {
+                        e.getValue().refreshState();
                 }
 
-                for (Map.Entry<ValueControl, Object> e : values.entrySet()) {
-                        e.getKey().pushValueToUserInterface(e.getValue());
-                }
                 refreshControlButtons();
-                ObjectPanel.this.revalidate();
-
+                // ObjectPanel.this.revalidate();
         }
 
@@ -105 +100 @@
         public String getTitle() {
                 return "Properties";
-        }
-
-        @Override
-        public JPanel getPanelForControls() {
-                return contentPanel;
         }
 
@@ -122 +112 @@
         }
 
+        @Override
+        public boolean onValueChange(ValueControl control, Object newValue) {
+                if (currentPath == null) {
+                        return true;
+                }
+                boolean result = treeAtFrame.changeValue(currentPath.assureResolved().getTopObject(), control, newValue);
+                refreshControlButtons();
+                return result;
+        }
+
 }

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

@@ -15 +15 @@
 import com.framsticks.util.FramsticksException;
 import com.framsticks.util.dispatching.Dispatcher;
+import com.framsticks.util.dispatching.Dispatching;
 import com.framsticks.util.dispatching.ExceptionResultHandler;
 import com.framsticks.util.dispatching.RunAt;
 
-public class StatusBar implements ExceptionResultHandler, Dispatcher<StatusBar> {
+public class StatusBar implements ExceptionResultHandler {
         private static final Logger log = LogManager.getLogger(StatusBar.class);
 
@@ -24 +25 @@
         protected JPanel swing;
         protected ExceptionResultHandler exceptionHandler;
+        protected final Dispatcher<?> dispatcher;
 
         /**
          *
          */
-        public StatusBar() {
+        public StatusBar(Dispatcher<?> dispatcher) {
+                this.dispatcher = dispatcher;
+        }
+
+        @SuppressWarnings({"rawtypes", "unchecked"})
+        public void showInfo(final Object value) {
+                Dispatching.dispatchIfNotActive(dispatcher, new RunAt(this) {
+
+                        @Override
+                        protected void runAt() {
+                                String text = value.toString();
+                                log.info("info: {}", text);
+                                statusBar.setText(text);
+
+                        }
+                });
         }
 
         @Override
+        @SuppressWarnings({"rawtypes", "unchecked"})
         public void handle(final FramsticksException exception) {
-                dispatch(new RunAt<StatusBar>(this) {
+                dispatcher.dispatch(new RunAt(this) {
 
                         @Override
@@ -58 +76 @@
         }
 
-        @Override
-        public boolean isActive() {
-                return SwingDispatcher.getInstance().isActive();
-        }
-
-        @Override
-        public void dispatch(RunAt<? extends StatusBar> runnable) {
-                SwingDispatcher.getInstance().dispatch(runnable);
-        }
-
         /**
          * @return the swing

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

@@ -1 +1 @@
 package com.framsticks.gui;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import com.framsticks.util.dispatching.AbstractJoinable;
 import com.framsticks.util.dispatching.Dispatcher;
-import com.framsticks.util.dispatching.JoinableDispatcher;
-import com.framsticks.util.dispatching.Task;
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
 
@@ -16 +12 @@
  * @author Piotr Sniegowski
  */
-public class SwingDispatcher<C> extends AbstractJoinable implements JoinableDispatcher<C> {
+public class SwingDispatcher<C> extends AbstractJoinable implements Dispatcher<C> {
 
         @SuppressWarnings("rawtypes")
@@ -42 +38 @@
         @Override
         public final void dispatch(RunAt<? extends C> runnable) {
-                if (runnable instanceof Task) {
-                        final Task<?> task = (Task<?>) runnable;
-                        Timer timer = new Timer(0, null);
-                        timer.addActionListener(new ActionListener() {
-
-                                @Override
-                                public void actionPerformed(ActionEvent event) {
-                                        task.run();
-                                }
-
-                        });
-                        timer.setInitialDelay((int) (task.getMoment() - System.currentTimeMillis()));
-                        timer.setRepeats(false);
-                        timer.start();
-                        return;
-                }
                 SwingUtilities.invokeLater(runnable);
         }
@@ -73 +53 @@
         @Override
         protected void joinableInterrupt() {
-                finish();
+                finishJoinable();
         }
 

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

@@ -4 +4 @@
 import org.apache.logging.log4j.LogManager;
 
+import com.framsticks.core.SideNoteKey;
 import com.framsticks.core.Tree;
 import com.framsticks.core.Node;
 import com.framsticks.core.Path;
-import com.framsticks.core.TreeOperations;
+import static com.framsticks.core.TreeOperations.*;
 import com.framsticks.gui.controls.ValueControl;
 import com.framsticks.params.CompositeParam;
 import com.framsticks.params.FramsClass;
+import com.framsticks.params.PrimitiveParam;
 
 import java.util.*;
@@ -30 +32 @@
         protected Node rootNode;
 
+        protected final SideNoteKey<UserChanges> userChangesKey = SideNoteKey.make(UserChanges.class);
+
         public TreeAtFrame(Tree tree, Frame frame) {
                 this.frame = frame;
@@ -44 +48 @@
         public Tree getTree() {
                 return tree;
+        }
+
+        /**
+         * @return the userChangesKey
+         */
+        public SideNoteKey<UserChanges> getUserChangesKey() {
+                return userChangesKey;
         }
 
@@ -71 +82 @@
                 if (panels.isEmpty()) {
                         panel = new EmptyTreePanel(parameters);
-                } else  if (panels.size() == 1) {
+                } else  if (panels.size() == 1) {
                         panel = panels.get(0);
                 } else {
@@ -83 +94 @@
         }
 
-
-        public boolean hasLocalChanges(Object object) {
-                NodeAtFrame nodeAtFrame = tree.getSideNote(object, this, NodeAtFrame.class);
-                if (nodeAtFrame == null) {
-                        return false;
-                }
-                return !nodeAtFrame.localChanges.isEmpty();
-        }
-
-        public NodeAtFrame assureLocalInfo(Object object) {
-                assert frame.isActive();
-                NodeAtFrame nodeAtFrame = tree.getSideNote(object, this, NodeAtFrame.class);
-
-                if (nodeAtFrame == null) {
-                        nodeAtFrame = new NodeAtFrame();
-                        // log.debug();
-                        tree.putSideNote(object, this, nodeAtFrame);
-                }
-                return nodeAtFrame;
-        }
-
-        public NodeAtFrame getLocalInfo(Object object) {
-                return tree.getSideNote(object, this, NodeAtFrame.class);
-        }
-
         public boolean changeValue(Object object, ValueControl component, Object newValue) {
                 log.debug("changing value of {} to '{}'", component, newValue);
 
-                assureLocalInfo(object).localChanges.put(component, newValue);
+                getOrCreateSideNote(tree, object, userChangesKey).changes.put(component.getParam().getId(), newValue);
 
                 return true;
         }
 
-        public void pushLocalChanges(Path path) {
+
+        public void pushUserChangesToTree(final Path path) {
                 assert frame.isActive();
                 path.assureResolved();
 
-                NodeAtFrame nodeAtFrame = getLocalInfo(path.getTopObject());
-                if (nodeAtFrame == null) {
+                final UserChanges userChanges = getSideNote(path, userChangesKey);
+                if (userChanges == null) {
                         return;
                 }
-                for (Map.Entry<ValueControl, Object> e : nodeAtFrame.localChanges.entrySet()) {
-                        TreeOperations.set(path, e.getKey().getParam(), e.getValue(), new FutureHandler<Integer>(frame) {
+                removeSideNote(path, userChangesKey);
+
+                for (final Map.Entry<String, Object> e : userChanges.changes.entrySet()) {
+                        set(path, getParam(path, e.getKey(), PrimitiveParam.class), e.getValue(), new FutureHandler<Integer>(frame) {
                                 @Override
                                 protected void result(Integer flag) {
+                                        assert frame.isActive();
+                                        userChanges.changes.remove(e.getKey());
                                 }
                         });

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

@@ -2 +2 @@
 
 import com.framsticks.core.Path;
-import com.framsticks.core.TreeOperations;
+import com.framsticks.core.Tree;
+import static com.framsticks.core.TreeOperations.*;
 import com.framsticks.gui.tree.AbstractNode;
 import com.framsticks.gui.tree.TreeNode;
@@ -28 +29 @@
                 }
                 setCurrentPath(path);
-                pullValuesFromLocalToUser(TreeOperations.bindAccess(path));
+                pullValuesFromLocalToUser(bindAccess(path));
         }
 
@@ -79 +80 @@
                 return treeAtFrame;
         }
-
+        public final Object getCurrentObject() {
+                assert currentPath != null;
+                return currentPath.getTopObject();
+        }
+        public final Tree getTree() {
+                assert currentPath != null;
+                return currentPath.getTree();
+        }
 
         public final String getClassName() {

java/main/src/main/java/com/framsticks/gui/controls/CheckBoxControl.java

@@ -10 +10 @@
 import org.apache.logging.log4j.LogManager;
 
+import com.framsticks.gui.Gui;
 import com.framsticks.params.types.BooleanParam;
 
@@ -31 +32 @@
                 });
                 this.setMaximumSize(new Dimension(Integer.MAX_VALUE, Control.LINE_HEIGHT));
-                addAsOnlyChild(checkBox);
+                Gui.addLeftToLabel(this, checkBox);
         }
 

java/main/src/main/java/com/framsticks/gui/controls/Control.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
-import java.awt.BorderLayout;
+// import java.awt.BorderLayout;
 
-import javax.swing.JComponent;
+
 import javax.swing.JPanel;
 
+import com.framsticks.core.Path;
 import com.framsticks.params.ParamFlags;
 import com.framsticks.params.Param;
 import com.framsticks.util.FramsticksException;
+import com.framsticks.util.Misc;
 import com.framsticks.util.dispatching.ExceptionResultHandler;
 
@@ -57 +59 @@
 
         public final boolean isReadonly() {
-                return !userEnabled || param.hasFlag(ParamFlags.READONLY);
+                return !userEnabled || param.hasFlag(ParamFlags.READONLY) || param.hasFlag(ParamFlags.USERREADONLY);
         }
 
-        protected void addAsOnlyChild(JComponent component) {
-                this.setLayout(new BorderLayout());
-                this.add(component, BorderLayout.CENTER);
-        }
 
         @Override
@@ -74 +72 @@
                 owner.handle(exception);
         }
+
+        public Path getCurrentPath() {
+                return owner.getCurrentPath();
+        }
+
+        public Path assureCurrentPath() {
+                return Misc.throwIfNull(owner.getCurrentPath());
+        }
+
+        public void refreshState() {
+        }
 }

java/main/src/main/java/com/framsticks/gui/controls/ControlOwner.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
-import javax.swing.JPanel;
 
 import com.framsticks.core.Path;
@@ -9 +8 @@
 public interface ControlOwner extends ExceptionResultHandler {
 
-        public JPanel getPanelForControls();
         public Path getCurrentPath();
         public Frame getFrame();
+        public boolean onValueChange(ValueControl control, Object newValue);
 
 }

java/main/src/main/java/com/framsticks/gui/controls/EnumControl.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
+import com.framsticks.gui.Gui;
 import com.framsticks.params.types.EnumParam;
 import com.framsticks.util.lang.Numbers;
@@ -35 +36 @@
                         }
                 });
-                addAsOnlyChild(list);
+                Gui.addLeftToLabel(this, list);
         }
 

java/main/src/main/java/com/framsticks/gui/controls/EventControl.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+
+import com.framsticks.core.Path;
+import com.framsticks.core.SideNoteKey;
+import com.framsticks.gui.Frame;
+import com.framsticks.gui.Gui;
+import com.framsticks.gui.table.AbstractTableModel;
+import com.framsticks.params.EventListener;
 import com.framsticks.params.types.EventParam;
+import com.framsticks.util.FramsticksUnsupportedOperationException;
+import com.framsticks.util.dispatching.Dispatching;
+import com.framsticks.util.dispatching.FutureHandler;
+import com.framsticks.util.dispatching.RunAt;
+import com.framsticks.util.lang.Pair;
+
+import static com.framsticks.core.TreeOperations.*;
 
 /**
@@ -13 +29 @@
  */
 @SuppressWarnings("serial")
-public class EventControl extends Control {
+public class EventControl extends HistoryControl {
         // private static final Logger log = LogManager.getLogger(EventControl.class.getName());
 
-        protected final JButton button;
-        boolean subscribed = true;
+        @SuppressWarnings("rawtypes")
+        protected final SideNoteKey<EventListener> listenerKey = SideNoteKey.make(EventListener.class);
+
+        public static class History {
+                protected final List<Pair<Date, Object>> entries = new ArrayList<>();
+        };
+
+        protected final SideNoteKey<History> historyKey = SideNoteKey.make(History.class);
+        protected TableModel tableModel;
 
         public EventControl(final EventParam eventParam) {
                 super(eventParam);
 
-                button = new JButton("subscribe");
-                this.add(button);
-                this.setMaximumSize(new Dimension(Integer.MAX_VALUE, Control.LINE_HEIGHT));
-
-                button.addActionListener(new ActionListener() {
+                mainButton.setText("Subscribe");
+                mainButton.setName("subscription");
+
+                tableModel = new TableModel();
+                resultsTable.setModel(tableModel);
+
+                mainButton.addActionListener(new ActionListener() {
                         @Override
                         public void actionPerformed(ActionEvent e) {
-                                if (subscribed) {
-                                        //panel.getCurrentTreeNode().unsubscribe(eventParam);
-                                } else {
-                                        //panel.getCurrentTreeNode().subscribe(eventParam);
+                                final Path path = assureCurrentPath();
+                                EventListener<?> listener = getSideNote(path, listenerKey);
+                                if (listener != null) {
+                                        removeSideNote(path, listenerKey);
+                                        refreshState();
+                                        path.getTree().removeListener(path, getParam(), listener, FutureHandler.doNothing(Void.class, owner.getFrame()));
+                                        return;
                                 }
+
+                                final EventListener<Object> newListener = new EventListener<Object>() {
+                                        @Override
+                                        public void action(final Object argument) {
+                                                /** actions can be invoked from anywhere */
+                                                Dispatching.dispatchIfNotActive(owner.getFrame(), new RunAt<Frame>(owner.getFrame()) {
+
+                                                        @Override
+                                                        protected void runAt() {
+                                                                getOrCreateSideNote(path.getTree(), path.getTopObject(), historyKey).entries.add(Pair.make(new Date(), argument));
+                                                                refreshTable();
+                                                        }
+                                                });
+                                                // owner.getFrame().getStatusBar().showInfo("event " + param + " happened: " + argument);
+                                        }
+                                };
+
+                                path.getTree().addListener(path, getParam(), newListener, Object.class, new FutureHandler<Void>(owner.getFrame()) {
+
+                                        @Override
+                                        protected void result(Void result) {
+                                                putSideNote(path, listenerKey, newListener);
+                                                refreshState();
+                                        }
+                                });
+
                         }
                 });
 
+                updateFoldState();
+                Gui.setupTitledControl(this, controlRow, resultsScrollPane);
         }
 
         @Override
         protected void updateEnabled(boolean enabled) {
-                button.setEnabled(enabled);
-        }
-
-        /*
-        @Override
-        public void refresh() {
-                subscribed = panel.getCurrentTreeNode().hasSubscribed((EventParam)param);
-                button.setText(subscribed ? "unsubscribe" : "subscribe");
-                this.revalidate();
-        }
-        */
+                mainButton.setEnabled(enabled);
+        }
+
+        public boolean isListening() {
+                return hasSideNote(getCurrentPath(), listenerKey);
+        }
+
+        protected void refreshButtonState() {
+                mainButton.setText(isListening() ? "Don't listen" : "Listen");
+        }
+
+        @Override
+        protected void refreshTable() {
+                History history = getSideNote(assureCurrentPath(), historyKey);
+                tableModel.entries = history != null ? history.entries : null;
+                tableModel.refreshAll();
+        }
+
+        @Override
+        protected void clearTable() {
+                History history = getSideNote(assureCurrentPath(), historyKey);
+                if (history != null) {
+                        history.entries.clear();
+                }
+                refreshTable();
+        }
+
+        public void refreshState() {
+                refreshButtonState();
+                refreshTable();
+        }
+
+        @Override
+        public EventParam getParam() {
+                return (EventParam) param;
+        }
+
+
+        public class TableModel extends AbstractTableModel {
+
+                List<Pair<Date, Object>> entries;
+                SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss:SSS");
+
+                @Override
+                public Class<?> getColumnClass(int columnIndex) {
+                        return String.class;
+                }
+
+                @Override
+                public int getColumnCount() {
+                        return 2;
+                }
+
+                @Override
+                public String getColumnName(int columnIndex) {
+                        return columnIndex == 0 ? "Occured at" : "Argument";
+                }
+
+                @Override
+                public int getRowCount() {
+                        if (entries == null) {
+                                return 0;
+                        }
+                        if (isFolded()) {
+                                return entries.isEmpty() ? 0 : 1;
+                        }
+                        return entries.size();
+                }
+
+                @Override
+                public Object getValueAt(int rowIndex, int columnIndex) {
+                        if (entries == null) {
+                                return null;
+                        }
+                        Pair<Date, Object> entry;
+                        if (isFolded()) {
+                                if (rowIndex > 0) {
+                                        return null;
+                                }
+                                if (entries.isEmpty()) {
+                                        return null;
+                                }
+                                entry = entries.get(entries.size() - 1);
+                        } else {
+                                entry = entries.get(rowIndex);
+                        }
+                        return columnIndex == 0 ? format.format(entry.first) : entry.second;
+                }
+
+                @Override
+                public boolean isCellEditable(int rowIndex, int columnIndex) {
+                        return false;
+                }
+
+                @Override
+                public void setValueAt(Object value, int rowIndex, int columnIndex) {
+                        throw new FramsticksUnsupportedOperationException().msg("setting value in event history");
+                }
+
+
+        }
 }

java/main/src/main/java/com/framsticks/gui/controls/ProcedureControl.java

@@ -5 +5 @@
 import com.framsticks.gui.Gui;
 import com.framsticks.params.Param;
-import com.framsticks.params.ValueParam;
 import com.framsticks.params.types.ProcedureParam;
 import com.framsticks.util.dispatching.ExceptionResultHandler;
 import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
-import com.framsticks.util.swing.TooltipConstructor;
 
 import javax.swing.*;
-import javax.swing.border.BevelBorder;
 
 import org.apache.logging.log4j.Logger;
@@ -20 +17 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -26 +23 @@
 
 @SuppressWarnings("serial")
-public class ProcedureControl extends Control implements ControlOwner {
+public class ProcedureControl extends HistoryControl implements ControlOwner {
 
         private static final Logger log = LogManager.getLogger(ProcedureControl.class);
 
-        protected final JButton procedureButton;
+        protected final JPanel argumentsPanel;
 
-        final protected Map<ValueParam, ValueControl> components = new IdentityHashMap<>();
+        final protected Map<String, ValueControl> components = new HashMap<>();
 
         public ProcedureControl(ProcedureParam procedureParam) {
                 super(procedureParam);
 
-                this.setToolTipText(new TooltipConstructor()
-                        .append("name", procedureParam.getName())
-                        .append("id", procedureParam.getId())
-                        .append("help", procedureParam.getHelp())
-                        .build());
 
-                procedureButton = new JButton("Call");
-                procedureButton.setName("call");
+                mainButton.setText("Call");
+                mainButton.setName("call");
 
-                this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 
-                Gui.fillWithControls(this, procedureParam.getArgumentsType(), components, ValueControl.class);
+                argumentsPanel = new JPanel();
+                argumentsPanel.setName("arguments");
+
+                Gui.fillWithControls(this, argumentsPanel, procedureParam.getArgumentsType(), components, ValueControl.class);
 
                 if (components.size() != procedureParam.getArgumentsType().size()) {
-                        procedureButton.setEnabled(false);
-                }
-                if (!components.isEmpty()) {
-                        this.setBorder(new BevelBorder(BevelBorder.RAISED));
+                        mainButton.setEnabled(false);
                 }
 
-                procedureButton.addActionListener(new ActionListener() {
+                mainButton.addActionListener(new ActionListener() {
                         @Override
                         public void actionPerformed(ActionEvent e) {
@@ -65 +56 @@
                                 final List<Object> arguments = new LinkedList<Object>();
                                 for (Param arg : getParam().getArgumentsType()) {
-                                        Object value = components.get(arg).getCurrentValue();
+                                        Object value = components.get(arg.getId()).getCurrentValue();
                                         arguments.add(value);
                                         log.debug("argument {}: {}", arg, value);
@@ -74 +65 @@
                         }
                 });
-                this.add(procedureButton);
+
+                updateFoldState();
+                Gui.setupTitledControl(this, argumentsPanel, controlRow, resultsScrollPane);
 
         }
+
 
         public static void callProcedure(final Path path, final ProcedureParam param, Object[] arguments) {
@@ -93 +87 @@
 
         @Override
-        public JPanel getPanelForControls() {
-                return this;
-        }
-
-        @Override
         public ProcedureParam getParam() {
                 return (ProcedureParam) param;
@@ -104 +93 @@
         @Override
         protected void updateEnabled(boolean enabled) {
-                procedureButton.setEnabled(enabled);
+                mainButton.setEnabled(enabled);
                 for (ValueControl vc : components.values()) {
                         vc.setUserEnabled(enabled);
@@ -120 +109 @@
         }
 
+        @Override
+        public boolean onValueChange(ValueControl control, Object newValue) {
+                return true;
+        }
+
+        @Override
+        protected void refreshTable() {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        protected void clearTable() {
+                // TODO Auto-generated method stub
+
+        }
+
 }

java/main/src/main/java/com/framsticks/gui/controls/SliderControl.java

@@ -18 +18 @@
 import org.apache.logging.log4j.LogManager;
 
+import com.framsticks.gui.Gui;
 import com.framsticks.params.types.DecimalParam;
 import com.framsticks.params.types.FloatParam;
@@ -98 +99 @@
                 slider.setPaintTicks(true);
 
-                this.setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-                this.setAlignmentX(Box.CENTER_ALIGNMENT);
-                this.setAlignmentY(Box.CENTER_ALIGNMENT);
-
-                JPanel sliderPanel = new JPanel();
-                // sliderPanel.setLayout(new BoxLayout(sliderPanel, BoxLayout.LINE_AXIS));
+
 
 
@@ -140 +136 @@
                 }));
 
-                JPanel sVPanel = new JPanel();
-                sVPanel.setLayout(new BoxLayout(sVPanel, BoxLayout.LINE_AXIS));
-                sVPanel.add(text);
-                Layout.copyComponentDimensions(sVPanel, text);
-
-                JPanel sPanel = new JPanel();
-                sPanel.setLayout(new BoxLayout(sPanel, BoxLayout.LINE_AXIS));
-
+                JPanel valuePanel = new JPanel();
+                valuePanel.setLayout(new BoxLayout(valuePanel, BoxLayout.LINE_AXIS));
+                valuePanel.add(text);
+                Layout.copyComponentDimensions(valuePanel, text);
+
+
+                JPanel sliderPanel = new JPanel();
                 sliderPanel.setLayout(new BorderLayout());
                 sliderPanel.add(slider, BorderLayout.CENTER);
@@ -153 +148 @@
                 sliderPanel.setMinimumSize(new Dimension(0, 60));
 
-                sPanel.add(sVPanel);
-                sPanel.add(sliderPanel);
-
-                this.add(sPanel);
+
+                this.setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
+                this.setAlignmentX(Box.CENTER_ALIGNMENT);
+                this.setAlignmentY(Box.CENTER_ALIGNMENT);
+
+                Gui.addLeftToLabel(this, valuePanel, sliderPanel);
         }
 

java/main/src/main/java/com/framsticks/gui/controls/TextAreaControl.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
+import com.framsticks.gui.Gui;
 import com.framsticks.params.PrimitiveParam;
 
@@ -27 +28 @@
                 textArea.setMaximumSize(new Dimension(Integer.MAX_VALUE, maxSize));
 
-                this.revalidate();
+                Gui.setupTitledControl(this, textScrollPane);
+                // this.revalidate();
         }
 

java/main/src/main/java/com/framsticks/gui/controls/TextFieldControl.java

@@ -1 +1 @@
 package com.framsticks.gui.controls;
 
+import com.framsticks.gui.Gui;
 import com.framsticks.params.PrimitiveParam;
 import com.framsticks.util.lang.Strings;
@@ -33 +34 @@
                 addDefaultDocumentListener(textField);
 
-                addAsOnlyChild(textField);
+                Gui.addLeftToLabel(this, textField);
         }
 

java/main/src/main/java/com/framsticks/gui/controls/ValueControl.java

@@ -12 +12 @@
 import com.framsticks.util.lang.FlagsUtil;
 import com.framsticks.util.swing.TooltipConstructor;
+// import static com.framsticks.core.TreeOperations.*;
 
 /**
@@ -20 +21 @@
         private static final Logger log =
                 LogManager.getLogger(ValueControl.class);
-
-        /**
-         *
-         */
-        protected ValueControlListener listener;
 
         public ValueControl(PrimitiveParam<?> primitiveParam) {
@@ -64 +60 @@
         public abstract Object pullValueFromUserInterface();
 
-        public void setListener(ValueControlListener listener) {
-                this.listener = listener;
-        }
-
         protected Object filterValueThroughConstraints(Object candidate) {
-                Object oldValue = pullValueFromUserInterface();
+                Object oldValue = pullValueFromUserInterface();//bindAccess(owner.getCurrentPath()).get(getParam(), Object.class);
                 try {
                         ReassignResult<?> res = getParam().reassign(candidate, oldValue);
@@ -92 +84 @@
         protected boolean notifyOfChange() {
                 if (!programmaticChange) {
-                        if (listener == null) {
-                                return true;
-                        }
-                        return listener.onChange(getCurrentValue());
+                        return owner.onValueChange(this, getCurrentValue());
                 }
                 return true;

java/main/src/main/java/com/framsticks/gui/table/ListPanel.java

@@ -54 +54 @@
                 table = new JTable(tableModel);
                 tableModel.setupTable();
+                table.setShowGrid(false);
 
                 scrollPane = new JScrollPane(table);
@@ -72 +73 @@
 
         @Override
+        protected void revertChanges() {
+        }
+
+        @Override
         public void pullValuesFromLocalToUser(Access access) {
                 tableModel.attachSource(Casting.throwCast(ListAccess.class, access));
+                refreshControlButtons();
         }
 
@@ -87 +93 @@
                 return table;
         }
+
 }

java/main/src/main/java/com/framsticks/gui/table/PrimitiveColumn.java

@@ -2 +2 @@
 
 import com.framsticks.params.PrimitiveParam;
-import com.framsticks.util.UnsupportedOperationException;
+import com.framsticks.util.FramsticksUnsupportedOperationException;
 
 public class PrimitiveColumn extends Column {
@@ -31 +31 @@
         @Override
         public int setValueAt(int rowIndex, Object value) {
-                throw new UnsupportedOperationException().msg("setting value in table");
+                throw new FramsticksUnsupportedOperationException().msg("setting value in table");
         }
 

java/main/src/main/java/com/framsticks/gui/table/TableModel.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -10 +9 @@
 import javax.swing.JTable;
 import javax.swing.UIManager;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 
 import org.apache.logging.log4j.Logger;
@@ -23 +20 @@
 import com.framsticks.util.lang.Casting;
 
-public class TableModel implements javax.swing.table.TableModel {
+public class TableModel extends AbstractTableModel {
 
         private static final Logger log = LogManager.getLogger(TableModel.class);
 
-        protected List<TableModelListener> listeners = new LinkedList<>();
         protected ListAccess access;
         protected Access elementAccess;
@@ -52 +48 @@
         }
 
-        protected void refreshAll() {
-                for (TableModelListener l : listeners) {
-                        l.tableChanged(new TableModelEvent(this));
-                }
-        }
 
         /**
@@ -74 +65 @@
         }
 
-        @Override
-        public void addTableModelListener(TableModelListener listener) {
-                listeners.add(listener);
-        }
 
         @Override
@@ -114 +101 @@
         }
 
-        @Override
-        public void removeTableModelListener(TableModelListener listener) {
-                listeners.remove(listener);
-        }
 
 

java/main/src/main/java/com/framsticks/gui/tree/TreeModel.java

@@ -17 +17 @@
 import com.framsticks.core.Node;
 import com.framsticks.core.Path;
+import com.framsticks.core.SideNoteKey;
 import com.framsticks.core.TreeOperations;
 import com.framsticks.gui.Frame;
@@ -24 +25 @@
 import com.framsticks.params.ListAccess;
 import com.framsticks.params.PrimitiveParam;
-import com.framsticks.params.Util;
+import com.framsticks.params.ParamsUtil;
 import com.framsticks.params.ValueParam;
 import com.framsticks.params.types.EventParam;
 import com.framsticks.util.FramsticksException;
 import com.framsticks.util.Misc;
-import com.framsticks.util.UnsupportedOperationException;
+import com.framsticks.util.FramsticksUnsupportedOperationException;
 import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.lang.Casting;
@@ -91 +92 @@
         @Override
         public void valueForPathChanged(TreePath path, Object value) {
-                throw new UnsupportedOperationException().msg("changing value of tree node");
+                throw new FramsticksUnsupportedOperationException().msg("changing value of tree node");
         }
 
@@ -133 +134 @@
         public TreeModelEvent prepareModelEventRegarding(Access access, String id, TreePath treeListPath) {
 
-                int number = Util.getNumberOfCompositeParamChild(access, access.get(id, Object.class));
+                int number = ParamsUtil.getNumberOfCompositeParamChild(access, access.get(id, Object.class));
                 if (number == -1) {
                         log.debug("encountered minor tree inconsistency in {}", treeListPath);
@@ -438 +439 @@
 
 
-        protected final Object createdTag = new Object();
+        protected final SideNoteKey<Boolean> createdTag = SideNoteKey.make(Boolean.class);
 
 

java/main/src/main/java/com/framsticks/gui/tree/TreeNode.java

@@ -4 +4 @@
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
@@ -11 +10 @@
 import com.framsticks.core.Node;
 import com.framsticks.core.Path;
+import com.framsticks.core.SideNoteKey;
 import com.framsticks.core.Tree;
 import com.framsticks.gui.Frame;
@@ -59 +59 @@
                 hashCode = System.identityHashCode(path.getTopObject());
 
-                if (getTree().getSideNote(path.getTopObject(), getTreeModel().createdTag, Object.class) == getTreeModel().createdTag) {
+                if (isMarked(path.getTree(), path.getTopObject(), getTreeModel().createdTag, false)) {
                         return;
                 }
 
                 // path.getTree().putSideNote(path.getTopObject(), Textual.class, path.getTextual());
-                path.getTree().putSideNote(path.getTopObject(), getTreeModel().createdTag, getTreeModel().createdTag);
+                mark(path.getTree(), path.getTopObject(), getTreeModel().createdTag, true);
 
                 /** Iterate over all EventParams and for matching ValueParams register listeners. */
@@ -239 +239 @@
                 }
                 Access access = bindAccessForTreeObject(child);
-                CompositeParam param = getTree().getSideNote(child, CompositeParam.class, CompositeParam.class);
+                CompositeParam param = getTree().getSideNote(child, Path.OBJECT_PARAM_KEY);
                 String name = param.getId();
 
@@ -262 +262 @@
         }
 
-        // public static class Textual {
-        // }
 
         public String getTextual() {
                 return textual;
-                // return getTree().getSideNote(lock(), Textual.class, String.class);
-        }
-
-        protected final Object listenersTag = new Object();
-
-        public List<EventListener<?>> getListeners() {
-                @SuppressWarnings("unchecked")
-                List<EventListener<?>> result = getTree().getSideNote(lock(), listenersTag, List.class);
-                if (result == null) {
-                        result = new LinkedList<>();
-                        getTree().putSideNote(lock(), listenersTag, result);
-                }
-
-                return result;
-        }
+        }
+
+        @SuppressWarnings("rawtypes")
+        protected final SideNoteKey<LinkedList> listenersTag = SideNoteKey.make(LinkedList.class);
 
         protected <A> void tryAddListener(final Path path, final EventParam eventParam, Class<A> argumentType, final EventListener<A> listener) {
                 getTree().addListener(path, eventParam, listener, argumentType, new FutureHandler<Void>(getFrame()) {
+                        @SuppressWarnings("unchecked")
                         @Override
                         protected void result(Void result) {
                                 assert getFrame().isActive();
                                 log.debug("registered gui listener for {} at {}", eventParam, path);
-                                getListeners().add(listener);
+                                getOrCreateSideNote(getTree(), lock(), listenersTag).add(listener);
                         }
                 });