Changeset 87 for java/main/src/main/java/com/framsticks/parsers/MultiParamLoader.java

Timestamp:

06/28/13 11:56:03 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• FramsClass? and contained Param are now immutable classes (like String),

which allows to refer to them concurrently without synchronization
(which for example in turn simplifies GUI management)

• also make Path immutable (which was earlier only assumed)
• add global cache for FramsClasses? created solely and automatically

on base of Java classes.

• add global cache for ReflectionAccess?.Backend precomputed proxy

representations basing on given FramsClass?

• above changes greatly improved GUI responsivness during browsing
• furtherly improve Param class hierarchy
• allow to inject actions on state changes into MultiParamLoader?
• add more tests

CHANGELOG:

Add StatusListener? to MultiParamLoader?.

Minor refactorization in MultiParamLoader?.

First step with auto append.

Add SchemaTest?.

Improve Registry.

Clean up in Registry.

Work out Registry.

Use annotations for Param.

Fix ListChange?.

Improve fluent interface of the FramsClassBuilder?.

Done caching of ReflectionAccess?.Backend

Fix hashCode of Pair.

A step on a way to cache ReflectionAccess?.Backend

Make SimpleAbstractAccess?.framsClass a final field.

Add static cache for FramsClasses? based on java.

Only classes created strictly and automatically
based on java classes are using this cache.

Make all Params immutable.

Many improvement to make Param immutable.

Make PrimitiveParam? generic type.

Several changes to make Param immutable.

Make FramsClass? immutable.

Another improvement to Path immutability.

Several improvements to Path.

Improve PathTest?.

Configurarable MutabilityDetector?.

File:

• java/main/src/main/java/com/framsticks/parsers/MultiParamLoader.java (modified) (13 diffs)

java/main/src/main/java/com/framsticks/parsers/MultiParamLoader.java

@@ -9 +9 @@
 
 public class MultiParamLoader {
+
+        public interface StatusListener {
+                void onStatusChange();
+        }
+
         private final static Logger log = Logger.getLogger(MultiParamLoader.class);
 
@@ -27 +32 @@
         }
 
+        protected final Map<Status, List<StatusListener>> listeners = new HashMap<>();
+
         /**
          * Specifies the action that should be taken inside loops.
@@ -36 +43 @@
         protected AccessInterface lastAccessInterface;
 
+        protected static FramsClass emptyFramsClass = FramsClass.build().idAndName("<empty>").finish();
         /**
          * Empty Param representing unknown classes - used to omit unknown
          * objects in the file.
          */
-        protected AccessInterface emptyParam = new PropertiesAccess(new FramsClass());
+        protected AccessInterface emptyParam = new PropertiesAccess(emptyFramsClass);
 
         /**
@@ -57 +65 @@
         private Status status = Status.None;
 
-        private void setStatus(Status status) {
-                log.trace("changing status: " + this.status.toString() + " -> " + status.toString());
-                this.status = status;
-        }
 
         /**
@@ -176 +180 @@
                         lastAccessInterface.load(currentSource);
 
-                        if (isBreakCondition(Status.AfterObject)) {
-                                // break after object creation
+                        if (changeStatus(Status.AfterObject)) {
                                 return LoopAction.Break;
                         }
-
                         return LoopAction.Continue;
                 } else if (status == Status.BeforeUnknown) {
@@ -187 +189 @@
                         // found unknown object
                         emptyParam.load(currentSource);
-                        setStatus(Status.AfterObject);
-
+                        if (changeStatus(Status.AfterObject)) {
+                                return LoopAction.Break;
+                        }
                         return LoopAction.Continue;
                 }
@@ -236 +239 @@
          */
         private LoopAction isCommentLine(String line) {
-                if (line.charAt(0) == '#' && isBreakCondition(Status.OnComment)) {
-                        // it's a simple comment - maybe we should break?
+                if (line.charAt(0) == '#') {
                         lastComment = line;
-                        return LoopAction.Break;
-                }
-
+                        if (changeStatus(Status.OnComment)) {
+                                // it's a simple comment - maybe we should break?
+                                return LoopAction.Break;
+                        }
+                }
                 return LoopAction.Nothing;
         }
@@ -255 +259 @@
 
                         if (lastAccessInterface != null) {
-                                if (isBreakCondition(Status.BeforeObject)) {
-                                        log.debug("breaking before object");
+                                if (changeStatus(Status.BeforeObject)) {
                                         return LoopAction.Break;
                                 } else {
@@ -263 +266 @@
                         } else {
                                 lastUnknownObjectName = typeName;
-                                if (isBreakCondition(Status.BeforeUnknown)) {
-                                        log.debug("breaking before unknown");
+                                if (changeStatus(Status.BeforeUnknown)) {
                                         return LoopAction.Break;
                                 } else {
@@ -309 +311 @@
                 }
 
-                setStatus(Status.Finished);
+                changeStatus(Status.Finished);
         }
 
@@ -320 +322 @@
 
                 currentSource = source;
-                setStatus(Status.Loading);
+                changeStatus(Status.Loading);
 
                 return true;
@@ -391 +393 @@
          * Checks whether execution should break on selected condition.
          */
-        private boolean isBreakCondition(Status condition) {
-                setStatus(condition);
-                return breakConditions.contains(condition);
+        private boolean changeStatus(Status status) {
+                log.trace("changing status: " + this.status.toString() + " -> " + status.toString());
+                this.status = status;
+                if (listeners.containsKey(status)) {
+                        for (StatusListener l : listeners.get(status)) {
+                                l.onStatusChange();
+                        }
+                }
+                return breakConditions.contains(status);
         }
 
@@ -405 +413 @@
                 return result;
         }
+
+        public void addListener(Status status, StatusListener listener) {
+                if (!listeners.containsKey(status)) {
+                        listeners.put(status, new LinkedList<StatusListener>());
+                }
+                listeners.get(status).add(listener);
+        }
 }