Changeset 100 for java/main/src/main/java/com/framsticks/parsers/XmlLoader.java

Timestamp:

07/12/13 23:41:06 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add <include/> to configuration
• add side notes to tree
  • used to store arbitrary information alongside the tree structure
• migrate to log4j2
  • supports lazy string evaluation of passed arguments
• improve GUI tree
  • it stays in synchronization with actual state (even in high load test scenario)
• improve panel management in GUI
• make loading objects in GUI more lazy
• offload parsing to connection receiver thread
  • info parsing
  • first step of objects parsing
• fix connection parsing bug (eof in long values)
• support zero-arguments procedure in table view

CHANGELOG:
Implement procedure calls from table view.

Refactorization around procedures in tables.

Add table editor for buttons.

Render buttons in the the list view.

Further improve Columns.

Add Column class for TableModel?.

Accept also non-arguments ProcedureParams? in tableView.

Increase maximal TextAreaControl? size.

Add tooltip to ProcedureControl?.

Fix bug of interpreting eofs in long values by connection reader.

Further rework connection parsing.

Simplify client connection processing.

Test ListChange? modification.

Test ListChange? events with java server.

Add TestChild?.

Fix bug with fast deregistering when connecting to running server.

Another minor refactorization in TreeOperations?.

Fix bug in SimpleAbstractAccess? loading routine.

Another minor improvement.

Minor change.

Make reading of List objects two-phase.

Another minor change.

Dispatch parsing into receiver thread.

Another step.

Enclose passing value in ObjectParam? case in closure.

Minor step.

Minor change on way to offload parsing.

Temporarily comment out single ValueParam? get.

It will be generalized to multi ValueParam?.

Process info in receiver thread.

Add DispatchingExceptionHandler?.

Make waits in browser test longer.

Use FETCHED_MARK.

It is honored in GUI, where it used to decide whether to get values

after user action.

It is set in standard algorithm for processing fetched values.

Add remove operation to side notes.

Make loading more lazy.

Improve loading policy.

On node choose load itself, on node expansion, load children.

Minor improvement.

Fix bug with panel interleaving.

Minor improvements.

Improve panel management.

More cleaning around panels.

Reorganize panels.

Further improve tree.

Fix bug in TreeModel?.

Remove children from TreeNode?.

Implement TreeNode? hashCode and equals.

Make TreeNode? delegate equals and hashcode to internal reference.

Move listeners from TreeNode? to side notes.

Store path.textual as a side note.

Side note params instead of accesses for objects.

More refactorizations.

In TreeNode? bindAccess based on side notes.

Minor step.

Hide createAccess.

Rename AccessInterface? to Access.

Minor changes.

Several improvements in high load scenarios.

Change semantics of ArrayListAccess?.set(index, null);

It now removes the element, making list shorter
(it was set to null before).

Add path remove handler.

Handle exceptions in Connection.

Update .gitignore

Configure logging to file.

Move registration to TreeModel?.

Further refactorization.

Minor refactorization.

Minor improvements.

Use specialized event also for Modify action of ListChange?.

Use remove events.

Use the insertion events for tree.

Further improve tree refreshing.

Further improve reacting on events in GUI.

Fix problem with not adding objects on addition list change.

Migrate to log4j lazy String construction interface.

Migrate imports to log4j2.

Drop dependency on adapter to version 1.2.

Switch log4j implementation to log4j2.

Add dirty mark to the NodeAtFrame?.

Make selecting in AccessInterfaces? type safe.

Ignore containers size settings in Model and Genotype.

Use tree side notes to remember local changes and panels.

Add sideNotes to tree.

They will be used to store various accompanying information
right in the tree.

Use ReferenceIdentityMap? from apache in TreeNode?.

It suits the need perfectly (weak semantics on both key and value).

Make ArrayListParam? do not react size changes.

Guard in TableModel? before not yet loaded objects.

Add <include/> clause and AutoInjector?.

Extract common columns configuration to separate xml,
that can be included by other configurations.

File:

• java/main/src/main/java/com/framsticks/parsers/XmlLoader.java (modified) (12 diffs)

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

@@ -1 +1 @@
 package com.framsticks.parsers;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.LinkedList;
@@ -8 +11 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -15 +19 @@
 import org.w3c.dom.NodeList;
 
-import com.framsticks.params.AccessInterface;
+import com.framsticks.params.Access;
 import com.framsticks.params.Registry;
 import com.framsticks.util.AutoBuilder;
@@ -22 +26 @@
 
 public class XmlLoader {
-        private static final Logger log = Logger.getLogger(XmlLoader.class);
+        private static final Logger log = LogManager.getLogger(XmlLoader.class);
 
         protected Registry registry = new Registry();
@@ -30 +34 @@
          */
         public XmlLoader() {
+                registry.registerAndBuild(AutoInjector.class);
         }
 
@@ -56 +61 @@
         }
 
-        public Object processElement(Element element) {
+        public Object processElement(Element element, Class<?> enclosingClass) {
                 final String name = mangleName(element.getNodeName());
                 if (name.equals("import")) {
@@ -67 +72 @@
                         }
                 }
+                if (name.equals("include")) {
+                        String fileName = element.getAttribute("file");
+                        if (Strings.notEmpty(fileName)) {
+                                try {
+                                        return load(new FileInputStream(new File(fileName)), enclosingClass);
+                                } catch (FileNotFoundException e) {
+                                        throw new FramsticksException().msg("failed to include file").arg("file", fileName).cause(e);
+                                }
+                        }
+                        String resourceName = element.getAttribute("resource");
+                        if (Strings.notEmpty(resourceName)) {
+                                Class<?> javaClass = enclosingClass;
+                                String className = element.getAttribute("class");
+                                if (Strings.notEmpty(className)) {
+                                        try {
+                                                javaClass = Class.forName(className);
+                                        } catch (ClassNotFoundException e) {
+                                                throw new FramsticksException().msg("failed to find class for resource loading").arg("class name", className).cause(e);
+                                        }
+                                }
 
-                AccessInterface access = registry.createAccess(name);
+                                return load(javaClass.getResourceAsStream(resourceName), enclosingClass);
+                        }
+                        throw new FramsticksException().msg("invalid <include/> node");
+                }
+
+                Access access = registry.createAccess(name);
 
                 Object object = access.createAccessee();
@@ -81 +111 @@
 
                 NodeList children = element.getChildNodes();
-                log.debug("found " + children.getLength() + " children in " + object);
+                log.debug("found {} children in {}", children.getLength(), object);
                 for (int i = 0; i < children.getLength(); ++i) {
                         Node childNode = children.item(i);
@@ -87 +117 @@
                                 continue;
                         }
-                        Object childObject = processElement((Element) childNode);
+                        Object childObject = processElement((Element) childNode, object.getClass());
                         if (childObject == null) {
                                 continue;
@@ -104 +134 @@
                         }
                 }
-                log.debug("loaded " + object);
+                log.debug("loaded {}", object);
 
                 return object;
         }
 
-        public Object load(InputStream stream) {
+        protected Object load(InputStream stream, Class<?> enclosingClass) {
                 try {
                         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -119 +149 @@
                         assert element != null;
 
-                        return processElement(element);
+                        return processElement(element, enclosingClass);
 
                 } catch (Exception e) {
@@ -129 +159 @@
                 registry.registerAndBuild(type);
 
-                Object object = load(stream);
+                Object object = load(stream, type);
                 if (type.isAssignableFrom(object.getClass())) {
                         return type.cast(object);