Changeset 98 for java/main/src/main/java/com/framsticks/gui/ObjectPanel.java

Timestamp:

07/08/13 23:04:56 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• use custom TreeModel?
  • TreeNodes? are now very thin wrappers around actual data
  • use WeakReferences? extensively to make TreeNodes? only shadow the real structure and not sustain it
• remove global Tree listeners
• use IdentityHashMap? were appropriate
• add CompositeParam? interface to AccessInterface?
  • this interface takes into account only CompositeParams? (i.e. ValueParams? that are not PrimitiveParams?)
• make UniqueLists? sort in order of uids
• RemoteTrees? referred to from GUI use SwingDispatcher?
• rework resolving of paths
• add explicit reloading (Ctrl-R)

CHANGELOG:
Get data also on tree expansion.

Use nice framstick icon for empty nodes.

Update panel after reload if it is current.

Add shallow reload procedure.

Cut Gui prefix from several tree classes.

Bring back counter of GuiTreeNode?.

Use IdentityHashMap? were it is more appriopriate.

Remove TreeListener?.

Do not use TreeListener? in GUI.

Minor change.

Done migration to GuiTreeModel?.

BrowserTest? in that version always crashes frams.linux.

Move rendering implementation into GuiAbstractNode?.

Use hand-crafted list in GuiTreeNode?.

Generally, it would be a great place for WeakIdentityHashMap?
(but there is none in Java Collection Framework).

Remove superfluous logging.

Fix bug in GuiTreeNode?.

Use IdentityHashMap? instead of HashMap?.

Improve structure update.

Filter out invalid uids in UniqueListAccess?.

Improve TreeCellRenderer?.

Add filtering in TrackConsole?.

Improve TreeModel?.

More changes.

More improvements.

More changes.

Remove TreeNode?.

Support MetaNode? in the GuiTreeModel?.

Implement more in GuiTreeModel?.

Add CompositeParam? interface to FramsClass? and AccessInterface?.

Allow access by number to UniqueList?.

Add UidComparator?.

Use TreeMap? as a default accessee in unique list.

It keeps order of keys.

Introduce classes to use with new TreeModel?.

Another step.

Migrate from TreeNode? to Node in many places.

Remove some uses of TreeNode? as DefaultMutableTreeNode?.

Remove Path from TreeNode? interface.

Remove Path from TreeNode?.

Add Path recration from node feature.

Reworking TreeCellRenderer?.

Minor change of TreeOperations? interface.

Remove last methods from TreeNode?.

Another minor step.

Do not store reference to TreeAtFrame? in TreeNode?.

Add proxy exceptionHandler to StatusBar?.

Move panels management to TreeAtFrame?.

Store localChanges in the NodeAtFrame?.

More cleanup.

Move name computing to TreeCellRenderer?.

Move tooltip and icon computations to TreeCellRenderer?.

More dispatches removed.

Remove most dispatching from TreeNode?.

TreeNode? does not actually redispatch tasks.

Make Tree embedded in Browser use SwingDispatcher?.

Make lazy binding of Tree with Dispatcher.

Minor changes.

Organizational change in AbstractTree?.

Make AbstractTree? compose from Thread instead of inherit from it.

Make SwingDispatcher? and AtOnceDispatcher? Joinable compatible.

Add ListPanelProvider?.

Improve Controls readonly and enabled handling.

Properly pass ExceptionHandlers? in more places.

Make Tree.get accept ValueParam?.

• This is to allow access number of list elements.

Remove not needed get redirection in ClientAtServer?.

Rename tryResolve to tryGet.

Unify tryResolveAndGet into tryResolve.

Remove resolveTop from Tree interface.

Make Tree.get accept Future<Path>.

Use get to implement resolveTop also in ObjectTree?.

Unify resolveTop and get in RemoteTree?.

Another minor step.

More minor changes in tree operations.

Minor organizational changes.

In RemoteTree? first fetch info for root.

Reworking resolving.

Minor changes.

Make ListAccess? return proxy iterators (instead of creating temporary collection).

Let AccessInterface? return Iterable<Param>.

Improve resolving.

More improvements.

First working completion in ManagedConsole?.

Rename resolve to resolveTop.

This reflects the actuall functionality.

Change semantic of tryResolve and tryResolveAndGet.

File:

• java/main/src/main/java/com/framsticks/gui/ObjectPanel.java (modified) (5 diffs)

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

@@ -12 +12 @@
 
 import javax.swing.*;
+import javax.swing.tree.TreePath;
 
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import static com.framsticks.util.lang.Containers.filterInstanceof;
 
 import com.framsticks.util.FramsticksException;
-import com.framsticks.util.dispatching.RunAt;
 
 @SuppressWarnings("serial")
 public class ObjectPanel extends ModifiablePanel implements ControlOwner {
 
-        private static final Logger log = Logger.getLogger(ObjectPanel.class.getName());
+        private static final Logger log = Logger.getLogger(ObjectPanel.class);
 
-        final protected Map<Param, Control> components = new HashMap<Param, Control>();
-        final protected Map<ValueParam, ValueControl> valueControls = new HashMap<ValueParam, ValueControl>();
+        final protected Map<Param, Control> components = new IdentityHashMap<Param, Control>();
+        final protected Map<ValueParam, ValueControl> valueControls = new IdentityHashMap<ValueParam, ValueControl>();
 
         public ObjectPanel(Panel.Parameters parameters, Collection<Param> params) {
@@ -37 +37 @@
                 for (final ValueControl c : filterInstanceof(components.values(), ValueControl.class)) {
                         valueControls.put(c.getParam(), c);
+                        c.setUserEnabled(true);
                         c.setListener(new ValueControlListener() {
                                 @Override
                                 public boolean onChange(Object newValue) {
-                                        if (currentTreeNode == null) {
+                                        if (currentTreePath == null) {
                                                 return true;
                                         }
-                                        boolean result = currentTreeNode.changeValue(c, newValue);
+                                        boolean result = treeAtFrame.changeValue(currentTreePath, c, newValue);
                                         refreshControlButtons();
                                         return result;
@@ -57 +58 @@
         protected void applyChanges() {
                 assert frame.isActive();
-                assert currentTreeNode != null;
-                currentTreeNode.pushLocalChanges();
+                assert currentTreePath != null;
+                treeAtFrame.pushLocalChanges(currentTreePath);
         }
 
         protected void refreshControlButtons() {
                 assert frame.isActive();
-                applyButton.setEnabled(currentTreeNode.localChanges != null);
+                applyButton.setEnabled(treeAtFrame.hasLocalChanges(currentTreePath));
         }
 
@@ -71 +72 @@
         @Override
         public void pullValuesFromLocalToUser(AccessInterface access) {
-                assert currentTreeNode != null;
-                assert currentTreeNode.path.getTree().isActive();
+                assert currentTreePath != null;
                 log.debug("refreshing components");
 
-                final Map<ValueControl, Object> values = new HashMap<ValueControl, Object>();
+                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));
                 }
 
-                frame.dispatch(new RunAt<Frame>(frame) {
-                        @Override
-                        protected void runAt() {
-                                if (currentTreeNode.localChanges != null) {
-                                        for (Map.Entry<ValueControl, Object> e : currentTreeNode.localChanges.entrySet()) {
-                                                values.put(e.getKey(), e.getValue());
-                                        }
-                                }
-                                for (Map.Entry<ValueControl, Object> e : values.entrySet()) {
-                                        e.getKey().pushValueToUserInterface(e.getValue());
-                                }
-                                refreshControlButtons();
-                                ObjectPanel.this.revalidate();
+
+                NodeAtFrame nodeAtFrame = treeAtFrame.getLocalInfo(currentTreePath);
+                if (nodeAtFrame != null) {
+                        for (Map.Entry<ValueControl, Object> e : nodeAtFrame.localChanges.entrySet()) {
+                                values.put(e.getKey(), e.getValue());
                         }
-                });
+                }
+
+                for (Map.Entry<ValueControl, Object> e : values.entrySet()) {
+                        e.getKey().pushValueToUserInterface(e.getValue());
+                }
+                refreshControlButtons();
+                ObjectPanel.this.revalidate();
 
         }
@@ -109 +107 @@
 
         @Override
-        public TreeNode getCurrentTreeNode() {
-                return super.getCurrentTreeNode();
-        }
-
-        @Override
         public void handle(FramsticksException exception) {
                 frame.handle(exception);
         }
 
-        // public void updateValue() {
-        //      //assert panel.getFrame().isActive();
+        @Override
+        public TreePath getCurrentTreePath() {
+                return super.getCurrentTreePath();
+        }
 
-        //      final Node n = panel.getCurrentNode();
-        //      panel.getBrowser().getManager().invokeLater(new Runnable() {
-        //              @Override
-        //              public void run() {
-        //                      Object v = n.getAccess().get(param, Object.class);
-        //                      if (v == null) {
-        //                              v = param.getDef(Object.class);
-        //                      }
-        //                      final Object fv = v;
-        //                      panel.getBrowser().invokeLater(new Runnable() {
-        //                              @Override
-        //                              public void run() {
-        //                                      setValueImpl(fv);
-        //                              }
-        //                      });
-        //              }
-        //      });
-        // }
 
 }