Changeset 105 for java/main/src/main/java/com/framsticks/gui/tree/TreeModel.java

Timestamp:

09/10/13 21:11:41 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• import refactorization: move Tree, Path, etc.

from core to structure package

• initial serialization implementation
• improve PrimeExperiment? test
• many organizational changes and convenience improvements

CHANGELOG:
Make registry in AbstractTree? final.

Move most classes from core to structure package.

Minor changes.

Switch names of Future and FutureHandler?.

Rename ExceptionResultHandler? to ExceptionHandler?.

Rename ExceptionHandler? to ExceptionDispatcherHandler?.

Fix bug in ParamCandidate? cache.

Add missing synchronization to the BufferedDispatcher?.

Develop @Serialized support.

Rework serialization further.

Add serialization/deserialization interface to ValueParam?.

Move getStorageType and isNumeric from Param down to params hierarchy.

Minor changes.

Improve param type induction.

Add TestSerializedClass? for testing new serialization.

Add info files gor GenePool? and Population.

Add standard.expt exemplary netfile.

Add type name field to PropertiesObject?.

Use PropertiesObject? for PropertiesAccess? instead of ordinary map.

Hide getFramsClass is several more places.

More unification accross FramsClass?, Access and Path.

Add ParamCollection?.

Simplify interface for getting params from FramsClass?, Access
or Path.

Make Access.call() interface variadic.

Add arguments(args) convenience wrapper around new Object[] {args}.

Upgrade to apache.commons.lang version 3.1

Minor improvement with Response constructors.

Develop proper result printing in ClientAtServer?.

Add experimentNetsave to PrimeExperiment?.

File:

• java/main/src/main/java/com/framsticks/gui/tree/TreeModel.java (modified) (9 diffs)

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

@@ -14 +14 @@
 import org.apache.logging.log4j.LogManager;
 
-import com.framsticks.core.ListChange;
-import com.framsticks.core.Node;
-import com.framsticks.core.Path;
-import com.framsticks.core.SideNoteKey;
-import com.framsticks.core.TreeOperations;
-import com.framsticks.core.ValueChange;
 import com.framsticks.gui.Frame;
 import com.framsticks.params.Access;
@@ -29 +23 @@
 import com.framsticks.params.ValueParam;
 import com.framsticks.params.types.EventParam;
-import com.framsticks.util.FramsticksException;
+import com.framsticks.structure.Node;
+import com.framsticks.structure.Path;
+import com.framsticks.structure.SideNoteKey;
+import com.framsticks.structure.TreeOperations;
+import com.framsticks.structure.messages.ListChange;
+import com.framsticks.structure.messages.ValueChange;
 import com.framsticks.util.Misc;
 import com.framsticks.util.FramsticksUnsupportedOperationException;
-import com.framsticks.util.dispatching.FutureHandler;
+import com.framsticks.util.dispatching.Future;
 import com.framsticks.util.lang.Casting;
 
-import static com.framsticks.core.TreeOperations.*;
+import static com.framsticks.structure.TreeOperations.*;
 
 public class TreeModel implements javax.swing.tree.TreeModel {
@@ -42 +41 @@
 
         protected List<TreeModelListener> listeners = new LinkedList<>();
-
 
         protected final Frame frame;
@@ -208 +206 @@
         }
 
-        public TreePath convertToTreePath(Path path, boolean forceComplete) {
+        public TreePath convertToTreePath(Path path) {
                 assert frame.isActive();
 
@@ -271 +269 @@
                         return;
                 }
-                path.getTree().get(path, new FutureHandler<Path>(frame) {
+                path.getTree().get(path, new Future<Path>(frame) {
                         @Override
                         protected void result(Path result) {
-                                final TreePath treePath = convertToTreePath(result, true);
+                                final TreePath treePath = convertToTreePath(result);
 
 
@@ -358 +356 @@
 
                                         log.debug("reacting to change {} in {}", listChange, listPath);
-                                        final TreePath treeListPath = convertToTreePath(listPath, true);
-                                        if (treeListPath == null) {
-                                                throw new FramsticksException().msg("path was not fully converted").arg("path", listPath);
-                                        }
+                                        final TreePath treeListPath = convertToTreePath(listPath);
 
                                         if ((listChange.getAction().equals(ListChange.Action.Modify)) && (listChange.getPosition() == -1)) {
@@ -387 +382 @@
                                                         }
 
-                                                        listPath.getTree().get(childPath, new FutureHandler<Path>(frame) {
+                                                        listPath.getTree().get(childPath, new Future<Path>(frame) {
                                                                 @Override
                                                                 protected void result(Path result) {
@@ -394 +389 @@
                                                                         }
                                                                         assert frame.isActive();
-                                                                        final TreePath treePath = Misc.throwIfNull(frame.getTreeModel().convertToTreePath(result, true));
+                                                                        final TreePath treePath = Misc.throwIfNull(frame.getTreeModel().convertToTreePath(result));
 
                                                                         // treeModel.nodeStructureChanged(treePath);
@@ -420 +415 @@
                                                 case Modify: {
                                                         Path childPath = listPath.appendParam(access.prepareParamFor(id)).tryResolveIfNeeded();
-                                                        listPath.getTree().get(childPath, new FutureHandler<Path>(frame) {
+                                                        listPath.getTree().get(childPath, new Future<Path>(frame) {
                                                                 @Override
                                                                 protected void result(Path result) {