Changeset 87 for java/main/src/main/java/com/framsticks/parsers/Schema.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/Schema.java (modified) (12 diffs)

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

@@ -8 +8 @@
 
 import com.framsticks.params.*;
+import com.framsticks.params.annotations.AutoAppendAnnotation;
+import com.framsticks.params.annotations.FramsClassAnnotation;
+import com.framsticks.util.FramsticksException;
 import com.framsticks.util.lang.Numbers;
 import org.apache.log4j.Logger;
@@ -30 +33 @@
  * (please replace name and surname with my personal data)
  */
+@FramsClassAnnotation
 public class Schema {
 
@@ -42 +46 @@
                 //return new FileInputStream(new File(Schema.class.getResource("/parsers/f0def.xml").getPath()));
                 return Schema.class.getResourceAsStream("/parsers/f0def.xml");
+        }
+
+        public Schema() {
+        }
+
+        @AutoAppendAnnotation
+        public void addNeuroClass(NeuroClass neuroClass) {
         }
 
@@ -52 +63 @@
          *             the exception if one occurred while reading the stream
          */
-        public Schema(InputStream inputStream) throws Exception {
+        public Schema(InputStream inputStream) {
 
                 DocumentBuilderFactory factory;
@@ -105 +116 @@
 
                 } catch (IOException | ParserConfigurationException | SAXException e) {
-                        logger.fatal("unexpected exception occurred: ", e);
-                        throw e;
-                }
-
+                        throw new FramsticksException().msg("unexpected exception occurred").cause(e);
+                }
         }
 
@@ -170 +179 @@
          *             the exception in case of any error
          */
-        private static FramsClass processClass(Node classNode) throws Exception {
+        private static FramsClass processClass(Node classNode) {
                 String classId = null;
                 String className = "";
                 String classDescription = "";
                 try {
-                        classId = classNode.getAttributes().getNamedItem("ID")
-                                        .getNodeValue();
+                        classId = classNode.getAttributes().getNamedItem("ID").getNodeValue();
                 } catch (NullPointerException e) {
-                        throw new Exception("Class getId is not defined!");
+                        throw new FramsticksException().msg("class id is not defined");
                 }
 
@@ -184 +192 @@
                 classDescription = getAttributeFromNode("DESCRIPTION", classNode);
 
-                FramsClass framsClass = new FramsClass(classId, className, classDescription);
+                FramsClassBuilder builder = FramsClass.build().id(classId).name(className).description(classDescription);
 
                 NodeList classProperties = classNode.getChildNodes();
@@ -195 +203 @@
                                 String name = getAttribute(attributes, "NAME");
                                 if (name == null) {
-                                        logger.warn("Group name in class \"" + classId + "\" ("
-                                                        + className + ") is undefined");
+                                        logger.warn("Group name in class \"" + classId + "\" (" + className + ") is undefined");
                                 } else {
-                                        framsClass.appendGroup(new Group(name));
+                                        builder.group(new Group(name));
                                 }
                         } else if ("PROP".equals(node.getNodeName())
@@ -204 +211 @@
 
                                 NamedNodeMap attributes = node.getAttributes();
-                                Param param = processParameter(attributes, classId);
-                                framsClass.append(param);
+                                processParameter(attributes, classId, builder);
                         }
 
                 }
 
-                return framsClass;
+                return builder.finish();
         }
 
@@ -231 +237 @@
          *             the exception in case of any error
          */
-        private static Param processParameter(NamedNodeMap attributes, String classId)
-                        throws Exception {
+        private static void processParameter(NamedNodeMap attributes, String classId, FramsClassBuilder classBuilder) {
 
                 String id = getAttribute(attributes, "ID");
-                if (id == null)
-                        throw new Exception("Property ID in class \"" + classId
-                                        + "\" is undefined");
+                if (id == null) {
+                        throw new FramsticksException().msg("Property ID in class \"" + classId + "\" is undefined");
+                }
                 String type = getAttribute(attributes, "TYPE");
-                if (type == null)
-                        throw new Exception("TYPE of property \"" + id + "\" is undefined");
+                if (type == null) {
+                        throw new FramsticksException().msg("TYPE of property \"" + id + "\" is undefined");
+                }
 
                 String name = getAttribute(attributes, "NAME");
@@ -261 +267 @@
                 }
 
-                ParamBuilder builder = Param.build();
-                builder.id(id).name(name).help(description).group(group).flags(flags);
+                ParamBuilder builder = classBuilder.param(id).name(name).help(description).group(group).flags(flags);
 
                 builder.type(type);
@@ -282 +287 @@
                         builder.type(type);
                 }
-                return builder.finish();
+
+                classBuilder.param(builder);
         }