Changeset 87 for java/main/src/main/java/com/framsticks/params/Registry.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/params/Registry.java (modified) (5 diffs)

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

@@ -5 +5 @@
 import com.framsticks.params.annotations.FramsClassAnnotation;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
@@ -14 +17 @@
         private static final Logger log = Logger.getLogger(Registry.class.getName());
 
-        protected final Map<String, Class<?>> reflectedClasses = new HashMap<String, Class<?>>();
-        protected final Map<String, String> invertedReflectedClasses = new HashMap<String, String>();
-        protected final Map<String, FramsClass> infoCache = new HashMap<String, FramsClass>();
+        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 final void registerReflectedClass(String name, String id, String className) {
-                try {
-                        registerReflectedClass(name, id, Class.forName(className));
-                } catch (ClassNotFoundException e) {
-                        log.fatal("class not found during registration: " + e);
+                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);
                 }
         }
 
-        public void registerReflectedClass(String name, String id,
-                        Class<?> reflectedClass) {
-                if (name != null) {
-                        reflectedClasses.put(name, reflectedClass);
-                        invertedReflectedClasses.put(reflectedClass.getCanonicalName(), name);
-                }
-                if (id != null) {
-                        reflectedClasses.put(id, reflectedClass);
-                }
+        // protected void internalRegisterClass(FramsClass framsClass, @Nullable Class<?> javaClass) {
+        //      assert framsClass.getName() != null;
+        //      assert framsClass.getId() != null;
+        //      infoCacheByName.put(framsClass.getName(), framsClass);
+        //      infoCacheById.put(framsClass.getId(), framsClass);
+
+        //      if (javaClass != null) {
+        //              reflectedClasses.put(framsClass, javaClass);
+        //              infoCacheByJavaName.put(javaClass.getCanonicalName(), framsClass);
+        //      }
+        // }
+        protected final DoubleSet<String, String, Class<?>> javaClasses = new DoubleSet<>();
+        protected final DoubleSet<String, String, FramsClass> framsClasses = new DoubleSet<>();
+
+        public void registerReflectedClass(String name, String id, Class<?> reflectedClass) {
+                javaClasses.put(id, name, reflectedClass);
         }
 
@@ -50 +91 @@
 
         public AccessInterface createAccess(String name, FramsClass framsClass) throws ConstructionException {
-                if (reflectedClasses.containsKey(name)) {
-                        return new ReflectionAccess(reflectedClasses.get(name), framsClass);
+                assert framsClasses.containsValue(framsClass);
+                if (javaClasses.containsKey(name)) {
+                        return new ReflectionAccess(javaClasses.get(name), framsClass);
                 }
                 return new PropertiesAccess(framsClass);
@@ -57 +99 @@
 
         public void putInfoIntoCache(FramsClass framsClass) {
-                if (infoCache.containsKey(framsClass.getId())) {
-                        log.info("already cached " + framsClass);
-                        return;
-                }
                 log.debug("caching info for " + framsClass);
-                infoCache.put(framsClass.getId(), framsClass);
-                infoCache.put(framsClass.getName(), framsClass);
+                framsClasses.put(framsClass.getId(), framsClass.getName(), framsClass);
         }
 
-        public FramsClass getInfoFromCache(String id) {
-                if (id == null) {
+        public FramsClass getInfoFromCache(String identifier) {
+                if (identifier == null) {
                         return null;
                 }
-                if (infoCache.containsKey(id)) {
-                        return infoCache.get(id);
-                }
-                if (invertedReflectedClasses.containsKey(id)) {
-                        return getInfoFromCache(invertedReflectedClasses.get(id));
-                }
-                return null;
+                return framsClasses.get(identifier);
         }
 
@@ -102 +133 @@
         }
 
+        public Set<Class<?>> getReflectedClasses() {
+                return javaClasses.getValues();
+        }
+
+        public Set<FramsClass> getInfoCache() {
+                return framsClasses.getValues();
+        }
+
 }