Changeset 87 for java/main/src/main/java/com/framsticks/parsers/Loaders.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/Loaders.java (modified) (1 diff)

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

@@ -12 +12 @@
 
         public static FramsClass loadFramsClass(SourceInterface source) throws ConstructionException {
-                MultiParamLoader loader = new MultiParamLoader();
+                final MultiParamLoader loader = new MultiParamLoader();
                 loader.setNewSource(source);
 
-                FramsClass result = new FramsClass();
+                final FramsClassBuilder builder = FramsClass.build();
 
-                AccessInterface framsClassAccess = new ReflectionAccess(FramsClass.class, FramsClassBuilder.buildForClass(FramsClass.class));
-                AccessInterface paramBuilderAccess = new ReflectionAccess(ParamBuilder.class, FramsClassBuilder.buildForClass(ParamBuilder.class));
-                framsClassAccess.select(result);
+                final AccessInterface framsClassAccess = new ReflectionAccess(FramsClassBuilder.class, FramsClass.build().forClass(FramsClassBuilder.class));
+                AccessInterface paramBuilderAccess = new ReflectionAccess(ParamBuilder.class, FramsClass.build().forClass(ParamBuilder.class));
+                framsClassAccess.select(builder);
                 loader.addAccessInterface(framsClassAccess);
                 loader.addAccessInterface(paramBuilderAccess);
 
-                loader.addBreakCondition(MultiParamLoader.Status.AfterObject);
+                loader.addListener(MultiParamLoader.Status.AfterObject, new MultiParamLoader.StatusListener() {
+                        @Override
+                        public void onStatusChange() {
+                                Object object = loader.returnObject();
+                                if (object instanceof FramsClassBuilder) {
+                                        return;
+                                }
+                                if (framsClassAccess.select(builder).tryAutoAppend(object)) {
+                                        return;
+                                }
+                                throw new ConstructionException().msg("failed to interpretate object").arg("object", object);
+
+                        }
+                });
 
                 try {
-                        MultiParamLoader.Status condition;
-                        while ((condition = loader.go()) != MultiParamLoader.Status.Finished) {
-                                if (condition == MultiParamLoader.Status.AfterObject) {
-
-                                        Object object = loader.returnObject();
-                                        if (object instanceof FramsClass) {
-                                                continue;
-                                        }
-                                        if (object instanceof ParamBuilder) {
-                                                result.append(((ParamBuilder) object).finish());
-                                        }
-                                }
-                        }
-                        return result;
+                        loader.go();
+                        return builder.finish();
                 } catch (Exception e) {
                         throw new ConstructionException().msg("an error occurred while loading class description").arg("before", loader.getCurrentLine()).cause(e);