Changeset 88 for java/main/src/main/java/com/framsticks/params/Registry.java

Timestamp:

06/30/13 12:48:20 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• loading f0 schema with XmlLoader?
• use XmlLoader? to load configuration
• introduce unified fork-join model of various entities

(Instances, Connections, GUI Frames, etc.),
all those entities clean up gracefully on
shutdown, which may be initialized by user
or by some entity

• basing on above, simplify several organizing classes

(Observer, main class)

• add ExternalProcess? runner and it's extension: FramsServer?

(to host native frams server process from Java level)

CHANGELOG:
Remove redundant Observer class.

Clean up in AbstractJoinable?.

Update ExternalProcess? class to changes in joining model.

Another sweep through code with FindBugs?.

Find bug with not joining RemoteInstance?.

Joining almost works.

Much improved joining model.

More improvement to joining model.

Add logging messages around joinable operations.

Rename methods in AbstractJoinable?.

Improve Joinable.

Rewrite of entity structure.

More simplifications with entities.

Further improve joinables.

Let Frame compose from JFrame instead of inheriting.

Add join classes.

Improvements of closing.

Add Builder interface.

Add FramsServerTest?.xml

FramsServer? may be configured through xml.

Make Framsticks main class an Observer of Entities.

Make Observer a generic type.

Remove variables regarding to removed endpoint.

Simplify observer (remove endpoints).

More changes to Observer and Endpoint.

Minor improvements.

Add OutputListener? to ExternalProcess?.

Improve testing of ExternalProcess?.

Add ExternalProcess? runner.

Rename the Program class to Framsticks.

Migrate Program to use XmlLoader? configuration.

First steps with configuration using XmlLoader?.

Fix several bugs.

Move all f0 classes to apriopriate package.

XmlLoader? is able to load Schema.

XmlLoader? is loading classes and props.

Add GroupBuilder?.

File:

• java/main/src/main/java/com/framsticks/params/Registry.java (modified) (4 diffs)

java/main/src/main/java/com/framsticks/params/Registry.java

@@ -4 +4 @@
 
 import com.framsticks.params.annotations.FramsClassAnnotation;
+import com.framsticks.util.DoubleMap;
+import com.framsticks.util.FramsticksException;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
@@ -16 +14 @@
 public class Registry {
         private static final Logger log = Logger.getLogger(Registry.class.getName());
-
-        public static class DoubleSet<K1, K2, V> {
-                protected final Map<K1, V> byId = new HashMap<>();
-                protected final Map<K2, V> byName = new HashMap<>();
-                protected final Set<V> values = new HashSet<>();
-
-                public int size() {
-                        return values.size();
-                }
-
-                public void put(K1 id, K2 name, V value) {
-                        values.add(value);
-                        if (id != null) {
-                                byId.put(id, value);
-                        }
-                        if (name != null) {
-                                byName.put(name, value);
-                        }
-                }
-
-                public boolean containsValue(V value) {
-                        return values.contains(value);
-
-                }
-
-                public boolean containsKey(String identifier) {
-                        return byId.containsKey(identifier) || byName.containsKey(identifier);
-                }
-
-                public V get(String identifier) {
-                        if (byId.containsKey(identifier)) {
-                                return byId.get(identifier);
-                        }
-                        if (byName.containsKey(identifier)) {
-                                return byName.get(identifier);
-                        }
-                        return null;
-                }
-
-                public Set<V> getValues() {
-                        return Collections.unmodifiableSet(values);
-                }
-        }
 
         // protected void internalRegisterClass(FramsClass framsClass, @Nullable Class<?> javaClass) {
@@ -71 +26 @@
         //      }
         // }
-        protected final DoubleSet<String, String, Class<?>> javaClasses = new DoubleSet<>();
-        protected final DoubleSet<String, String, FramsClass> framsClasses = new DoubleSet<>();
+        protected final DoubleMap<String, Class<?>> javaClasses = new DoubleMap<>();
+        protected final DoubleMap<String, FramsClass> framsClasses = new DoubleMap<>();
 
         public void registerReflectedClass(String name, String id, Class<?> reflectedClass) {
@@ -78 +33 @@
         }
 
+        public Registry registerAndBuild(Class<?> reflectedClass) {
+                register(reflectedClass);
+                putInfoIntoCache(FramsClass.build().forClass(reflectedClass));
+                return this;
+        }
+
         public Registry register(Class<?> reflectedClass) {
                 FramsClassAnnotation a = reflectedClass.getAnnotation(FramsClassAnnotation.class);
                 if (a == null) {
-                        log.error("class is not annotated: " + reflectedClass);
-                        return this;
+                        throw new FramsticksException().msg("class is not annotated").arg("class", reflectedClass);
                 }
 
                 registerReflectedClass(FramsClassBuilder.getName(a, reflectedClass), FramsClassBuilder.getId(a, reflectedClass), reflectedClass);
-
                 return this;
         }
 
         public AccessInterface createAccess(String name, FramsClass framsClass) throws ConstructionException {
-                assert framsClasses.containsValue(framsClass);
+                // assert framsClasses.containsValue(framsClass);
                 if (javaClasses.containsKey(name)) {
                         return new ReflectionAccess(javaClasses.get(name), framsClass);