Changeset 98 for java/main/src/main/java/com/framsticks/params/UniqueListAccess.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/params/UniqueListAccess.java (modified) (7 diffs)

java/main/src/main/java/com/framsticks/params/UniqueListAccess.java

@@ -1 +1 @@
 package com.framsticks.params;
 
+import com.framsticks.util.FramsticksException;
+import com.framsticks.util.UnimplementedException;
+import com.framsticks.util.UnsupportedOperationException;
 import com.framsticks.util.lang.Casting;
 import com.framsticks.util.lang.Numbers;
@@ -12 +15 @@
 public class UniqueListAccess extends ListAccess {
 
-        private static final Logger log = Logger.getLogger(UniqueListAccess.class.getName());
+        private static final Logger log = Logger.getLogger(UniqueListAccess.class);
 
         Map<String, Object> map;
@@ -23 +26 @@
         }
 
+        public static Integer getUidNumber(String uid) {
+                try {
+                        return Integer.valueOf(uid.substring(1));
+                } catch (NumberFormatException e) {
+                        return null;
+                }
+        }
+
+        public static class UidComparator implements Comparator<String> {
+
+                protected String name;
+
+                /**
+                 * @param name
+                 */
+                public UidComparator(String name) {
+                        this.name = name;
+                }
+
+                @Override
+                public int compare(String a, String b) {
+                        if (a.equals(b)) {
+                                return 0;
+                        }
+                        int diff = a.length() - b.length();
+                        if (diff != 0) {
+                                return diff;
+                        }
+                        Integer au = getUidNumber(a);
+                        Integer bu = getUidNumber(b);
+                        if (au == null || bu == null) {
+                                throw new FramsticksException().msg("comparator failure").arg("left", a).arg("right", b).arg("in", this);
+                        }
+                        return au - bu;
+                }
+
+                @Override
+                public String toString() {
+                        return "comparator " + name;
+                }
+
+
+        }
+
         @Override
         public Map<String, Object> createAccessee() {
-                return new HashMap<String, Object>();
-        }
-
-        @Override
-        public Param getParam(int i) {
-                log.error("accesing unique list through index");
-                assert false;
-                return null;
-                //log.error("accesing unique list through index");
-                //return null;
-                //return Param.build().setId(Integer.toString(i)).setName(elementAccess.getId()).type("o " + elementAccess.getId()).build();
-        }
-
-        @Override
-        public Param getParam(String id) {
+                return new TreeMap<String, Object>(new UidComparator(elementAccess.toString()));
+        }
+
+        @Override
+        public CompositeParam getParam(int i) {
+                if ((i < 0) ||  (i >= map.size())) {
+                        return null;
+                }
+                return Param.build().id(Integer.toString(i)).forAccess(elementAccess).finish(CompositeParam.class);
+        }
+
+        @Override
+        public CompositeParam getParam(String id) {
                 Integer i = Numbers.parse(id, Integer.class);
                 if (i != null) {
                         return getParam(i);
                 }
-                //TODO list access here
-                return Param.build().id(id).forAccess(elementAccess).finish();
+                Integer uidNumber = getUidNumber(id);
+                if (uidNumber == null) {
+                        return null;
+                }
+                if (!map.containsKey(id)) {
+                        return null;
+                }
+                return Param.build().id(id).forAccess(elementAccess).finish(CompositeParam.class);
         }
 
@@ -60 +111 @@
         @Override
         public <T> T get(int i, Class<T> type) {
-                log.error("accesing unique list through index");
-                assert false;
-                return null;
-                //Object[] values = map.values().toArray();
-                //return Casting.tryCast(i < values.length ? values[i] : null, type);
+                Iterator<Map.Entry<String, Object>> iterator = map.entrySet().iterator();
+                while (i > 0 && iterator.hasNext()) {
+                        iterator.next();
+                        --i;
+                }
+                if (i > 0) {
+                        return null;
+                }
+                if (!iterator.hasNext()) {
+                        return null;
+                }
+                return Casting.tryCast(type, iterator.next().getValue());
         }
 
@@ -73 +131 @@
                         return get(i, type);
                 }
-                return Casting.tryCast(type, map.containsKey(id) ? map.get(id) : null);
+                Integer uidNumber = getUidNumber(id);
+                if (uidNumber == null) {
+                        return null;
+                }
+                return Casting.tryCast(type, map.get(id));
         }
 
@@ -110 +172 @@
         @Override
         public <T> int set(int i, T value) {
-                log.error("accesing unique list through index");
-                //return setByUid(value, null);
-                return 0;
+                throw new UnsupportedOperationException().msg("accesing unique list through index");
         }
 
@@ -184 +244 @@
 
         @Override
-        public Collection<Param> getParams() {
-                List<Param> result = new LinkedList<Param>();
-                if (map == null) {
-                        return result;
-                }
-                for (String k : map.keySet()) {
-                        result.add(getParam(k));
-                }
-                return result;
+        public Iterable<Param> getParams() {
+                return new Iterable<Param>() {
+
+                        @Override
+                        public Iterator<Param> iterator() {
+                                return new Iterator<Param>() {
+
+                                        protected Iterator<Map.Entry<String, Object>> internal = map.entrySet().iterator();
+
+                                        @Override
+                                        public boolean hasNext() {
+                                                return internal.hasNext();
+                                        }
+
+                                        @Override
+                                        public Param next() {
+                                                return Param.build().id(internal.next().getKey()).forAccess(elementAccess).finish();
+                                        }
+
+                                        @Override
+                                        public void remove() {
+                                                throw new UnimplementedException().msg("remove element from list").arg("list", UniqueListAccess.this);
+
+                                        }
+                                };
+                        }
+                };
+        }
+
+        @Override
+        public int getCompositeParamCount() {
+                return map.size();
+        }
+
+        @Override
+        public CompositeParam getCompositeParam(int number) {
+                return getParam(number);
         }
 }