Changeset 84 for java/main/src/main/java/com/framsticks/gui/Panel.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/Panel.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 import com.framsticks.params.AccessInterface;
-import org.apache.log4j.Logger;
+import com.framsticks.params.CompositeParam;
+import com.framsticks.params.FramsClass;
+// import org.apache.log4j.Logger;
 
 import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
- * @author Piotr Sniegowski
+ * Author: Piotr Śniegowski
  */
+@SuppressWarnings("serial")
 public abstract class Panel extends JPanel {
 
-        private static final Logger LOGGER = Logger.getLogger(Panel.class.getName());
+        public static class Parameters {
+                public final EndpointAtFrame endpoint;
+                public final CompositeParam param;
+                public final FramsClass framsClass;
 
-        /**
-         * Pane to which components will be added.
-         */
-        protected JPanel contentPanel;
+                public Parameters(EndpointAtFrame endpoint, CompositeParam param, FramsClass framsClass) {
+                        this.endpoint = endpoint;
+                        this.param = param;
+                        this.framsClass = framsClass;
+                }
+        }
+
+        // private static final Logger log = Logger.getLogger(Panel.class.getName());
 
         protected TreeNode currentTreeNode;
-    protected EndpointAtFrame endpoint;
-    protected final Frame frame;
+        protected final EndpointAtFrame endpoint;
+        protected final Frame frame;
         protected final String className;
-        final protected JLabel label;
-        final protected JButton applyButton;
+        protected final FramsClass framsClass;
+        protected final CompositeParam param;
+        protected String uniqueName = "?";
 
-        public Panel(EndpointAtFrame endpoint, String className) {
-        this.endpoint = endpoint;
-                this.frame = endpoint.getFrame();
-                this.className = className;
-                LOGGER.debug("create panel for type: " + className);
-
-        endpoint.registerPanel(this);
-
-                contentPanel = new JPanel();
-                contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.PAGE_AXIS));
-                JScrollPane scroll = new JScrollPane(contentPanel);
-                //scroll.setBorder(BorderFactory.createEtchedBorder());
-
-                JPanel pageEndPanel = new JPanel();
-                pageEndPanel.setLayout(new BoxLayout(pageEndPanel, BoxLayout.X_AXIS));
-                pageEndPanel.add(Box.createHorizontalGlue());
-
-                applyButton = new JButton("Apply");
-                applyButton.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {
-                                applyChanges();
-                        }
-                });
-                pageEndPanel.add(applyButton);
-
-                pageEndPanel.add(Box.createHorizontalStrut(10));
-                pageEndPanel.setPreferredSize(new Dimension(0, 30));
-
-                label = new JLabel();
-                JPanel centerPanel = new JPanel();
-                centerPanel.setLayout(new BorderLayout());
-                centerPanel.add(Box.createHorizontalStrut(10), BorderLayout.LINE_START);
-                centerPanel.add(Box.createHorizontalStrut(10), BorderLayout.LINE_END);
-                centerPanel.add(label, BorderLayout.PAGE_START);
-                centerPanel.add(scroll, BorderLayout.CENTER);
-                centerPanel.add(pageEndPanel, BorderLayout.PAGE_END);
-
-                this.setLayout(new BorderLayout());
-                this.add(centerPanel, BorderLayout.CENTER);
-
-
+        public Panel(Parameters parameters) {
+                this.endpoint = parameters.endpoint;
+                this.frame = parameters.endpoint.getFrame();
+                this.framsClass = parameters.framsClass;
+                this.param = parameters.param;
+                this.className = parameters.param.getContainedTypeName();
+                this.setName(parameters.param.getFramsTypeName());
         }
 
-        public void setCurrentTreeNode(TreeNode node) {
-                currentTreeNode = node;
-                //label.setText(node.getNode().getPath());
-                //this.revalidate();
+        public void setCurrentTreeNode(TreeNode currentTreeNode) {
+                this.currentTreeNode = currentTreeNode;
         }
 
@@ -81 +53 @@
         }
 
-        protected abstract void applyChanges();
-        public abstract void refreshComponents(AccessInterface access);
+        public final Frame getFrame() {
+                return frame;
+        }
+
+        public final EndpointAtFrame getEndpointAtFrame() {
+                return endpoint;
+        }
+
+
+        public final String getClassName() {
+                return className;
+        }
+
+        public abstract void pullValuesFromLocalToUser(AccessInterface access);
 
         @Override
         public String toString() {
-                return currentTreeNode == null ? "?" : currentTreeNode.toString();
+                return uniqueName;
         }
 
-    public final Frame getFrame() {
-        return frame;
-    }
+        public final String getUniqueName() {
+                return uniqueName;
+        }
 
-
-    public final String getClassName() {
-        return className;
-    }
-
-    public final String getFullName() {
-        return className + "@" + endpoint.getName();
-    }
-
+        public abstract String getTitle();
 }