Changeset 101 for java/main/src/main/java/com/framsticks/core/TreeOperations.java

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.

File:

• java/main/src/main/java/com/framsticks/core/TreeOperations.java (modified) (14 diffs)

java/main/src/main/java/com/framsticks/core/TreeOperations.java

@@ -1 +1 @@
 package com.framsticks.core;
-
 
 import java.util.HashSet;
@@ -22 +21 @@
 import com.framsticks.params.PropertiesAccess;
 import com.framsticks.params.UniqueListAccess;
-import com.framsticks.params.Util;
+import com.framsticks.params.ParamsUtil;
 import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.ObjectParam;
@@ -43 +42 @@
         }
 
-        public static final Object FETCHED_MARK = new Object();
-
-        public static @Nonnull FramsClass processFetchedInfo(Tree tree, File file) {
+        public static final SideNoteKey<Boolean> FETCHED_MARK = SideNoteKey.make(Boolean.class);
+
+        public static @Nonnull
+        FramsClass processFetchedInfo(Tree tree, File file) {
                 assert tree.isActive();
                 FramsClass framsClass = Loaders.loadFramsClass(file.getContent());
@@ -80 +80 @@
                 assert path.isTheSame(files.get(0).getPath());
 
-
                 try {
                         log.debug("process fetched values: {}", path);
@@ -98 +97 @@
                                         if (path.getTop().getParam() instanceof ObjectParam) {
                                                 assert results.size() == 1;
-                                                Util.takeAllNonNullValues(bindAccess(result), parsingAccess.select(results.get(0)));
+                                                ParamsUtil.takeAllNonNullValues(bindAccess(result), parsingAccess.select(results.get(0)));
                                                 mark(result.getTree(), result.getTopObject(), FETCHED_MARK, true);
                                                 future.pass(result);
                                                 return;
                                         }
-
 
                                         final ListAccess listAccess = (ListAccess) access;
@@ -139 +137 @@
 
                                                 targetAccess.select(childTo);
-                                                Util.takeAllNonNullValues(targetAccess, parsingAccess);
+                                                ParamsUtil.takeAllNonNullValues(targetAccess, parsingAccess);
                                                 if (newOne) {
                                                         listAccess.set(id, childTo);
@@ -188 +186 @@
         }
 
-
-        public static @Nonnull Access bindAccessFromSideNote(Tree tree, Object object) {
-                CompositeParam param = tree.getSideNote(object, CompositeParam.class, CompositeParam.class);
+        public static @Nonnull
+        Access bindAccessFromSideNote(Tree tree, Object object) {
+                CompositeParam param = tree.getSideNote(object, Path.OBJECT_PARAM_KEY);
                 if (param == null) {
                         throw new FramsticksException().msg("failed to bind access from side node").arg("tree", tree).arg("object", object).arg("type", object.getClass());
@@ -197 +195 @@
         }
 
-        public static @Nonnull Access bindAccess(Tree tree, String path) {
+        public static @Nonnull
+        Access bindAccess(Tree tree, String path) {
                 log.debug("bind access for textual: {} in {}", path, tree);
                 return bindAccess(Path.to(tree, path));
         }
 
-        public static @Nonnull Access bindAccess(Node node) {
+        public static @Nonnull
+        Access bindAccess(Node node) {
                 Tree tree = node.getTree();
                 assert tree.isActive();
@@ -209 +209 @@
                 try {
                         Access access = tree.prepareAccess(node.getParam());
-                        tree.putSideNote(node.getObject(), CompositeParam.class, node.getParam());
+                        tree.putSideNote(node.getObject(), Path.OBJECT_PARAM_KEY, node.getParam());
 
                         return access.select(node.getObject());
@@ -218 +218 @@
         }
 
-        public static @Nonnull Access bindAccess(Path path) {
+        public static @Nonnull
+        Access bindAccess(Path path) {
                 assert path.getTree().isActive();
                 path.assureResolved();
@@ -280 +281 @@
                 });
         }
-
 
         /**
@@ -323 +323 @@
         public static Object createAccessee(Tree tree, CompositeParam param) {
                 Object object = tree.prepareAccess(param).createAccessee();
-                tree.putSideNote(object, CompositeParam.class, param);
+                tree.putSideNote(object, Path.OBJECT_PARAM_KEY, param);
                 return object;
         }
@@ -329 +329 @@
         public static Object createAccessee(Tree tree, Access access) {
                 Object object = access.createAccessee();
-                tree.putSideNote(object, CompositeParam.class, access.buildParam(new ParamBuilder()).finish(CompositeParam.class));
+                tree.putSideNote(object, Path.OBJECT_PARAM_KEY, access.buildParam(new ParamBuilder()).finish(CompositeParam.class));
                 return object;
         }
 
-        public static boolean isMarked(Tree tree, Object object, Object mark, boolean defValue) {
-                assert tree.isActive();
-                Boolean v = tree.getSideNote(object, mark, Boolean.class);
+        public static boolean isMarked(Tree tree, Object object, SideNoteKey<Boolean> mark, boolean defValue) {
+                assert tree.isActive();
+                Boolean v = tree.getSideNote(object, mark);
                 return (v != null ? v : defValue);
         }
 
-        public static void mark(Tree tree, Object object, Object mark, boolean value) {
+        public static void mark(Tree tree, Object object, SideNoteKey<Boolean> mark, boolean value) {
                 assert tree.isActive();
                 tree.putSideNote(object, mark, value);
@@ -348 +348 @@
         }
 
+        public static <T extends Param> T getParam(Path path, String id, Class<T> type) {
+                return getFramsClass(path).getParamEntry(id, type);
+        }
+
+        public static <T> T getOrCreateSideNote(Tree tree, Object object, SideNoteKey<T> key) {
+                T result = tree.getSideNote(object, key);
+                if (result == null) {
+                        result = key.newValue();
+                        tree.putSideNote(object, key, result);
+                }
+                return result;
+        }
+
+        public static <T> boolean hasSideNotes(Tree tree, Object object, SideNoteKey<T> key) {
+                return tree.getSideNote(object, key) != null;
+        }
+
+        public static <T> boolean hasSideNote(Path path, SideNoteKey<T> key) {
+                return path.getTree().getSideNote(path.getTopObject(), key) != null;
+        }
+
+        public static <T> T getSideNote(Path path, SideNoteKey<T> key) {
+                assert path.isResolved();
+                return path.getTree().getSideNote(path.getTopObject(), key);
+        }
+
+        public static <T> void putSideNote(Path path, SideNoteKey<T> key, T value) {
+                path.getTree().putSideNote(path.getTopObject(), key, value);
+        }
+
+        public static boolean removeSideNote(Path path, SideNoteKey<?> key) {
+                assert path.isResolved();
+                return path.getTree().removeSideNote(path.getTopObject(), key);
+        }
+
 }