Changeset 78 for java/main/src/main/java/com/framsticks/core/Instance.java

Timestamp:

01/09/13 00:09:10 (11 years ago)

Author:

psniegowski

Message:

Add f0 parsing and f0->Model transformation.

File:

• java/main/src/main/java/com/framsticks/core/Instance.java (modified) (9 diffs)

java/main/src/main/java/com/framsticks/core/Instance.java

@@ -23 +23 @@
     protected Node root;
 
-        protected final Map<String, FramsClass> infoCache = new HashMap<String, FramsClass>();
     public Set<InstanceListener> listeners = new HashSet<InstanceListener>();
 
@@ -34 +33 @@
     protected void run() {
         super.run();
-        registerTypicalReflectedClasses();
+                com.framsticks.model.Package.register(registry);
     }
 
     @Override
-    protected void configure() {
+    protected void configure() throws Exception {
         super.configure();
     }
 
-    protected abstract void fetchInfo(Path path, Future<FramsClass> future);
-    public abstract void resolve(Path path, Future<Path> future);
-    public abstract void fetchValue(Path path, Param param, StateFunctor stateFunctor);
-    public abstract void fetchValues(Path path, StateFunctor stateFunctor);
-    protected abstract void tryRegisterOnChangeEvents(Path path);
+    protected void fetchInfo(Path path, Future<FramsClass> future) {
+                future.result(null, new UnsupportedOperationException());
+        }
+
+        public void resolve(Path path, Future<Path> future) {
+                assert isActive();
+                assert path.isOwner(this);
+                if (path.getTop().getObject() != null) {
+                        future.result(path, null);
+                        return;
+                }
+                AccessInterface access = bindAccess(path.getUnder());
+                Object object = access.get(path.getTop().getParam(), Object.class);
+                if (object == null) {
+                        future.result(path, null);
+                        return;
+                }
+                future.result(path.appendResolution(object), null);
+        }
+
+    public void fetchValue(Path path, Param param, StateFunctor stateFunctor) {
+                stateFunctor.call(null);
+        }
+
+    public void fetchValues(Path path, StateFunctor stateFunctor) {
+                stateFunctor.call(null);
+        }
+
+    protected void tryRegisterOnChangeEvents(Path path) {
+
+        }
 
         public void storeValue(Path path, Param param, Object value, final StateFunctor stateFunctor) {
@@ -98 +123 @@
         }
 
-        public void putInfoIntoCache(FramsClass framsClass) {
-        assert isActive();
-        if (infoCache.containsKey(framsClass.getId())) {
-            LOGGER.info("already cached " + framsClass);
-            return;
-        }
-        LOGGER.debug("caching info for " + framsClass);
-                infoCache.put(framsClass.getId(), framsClass);
-        }
 
     public final FramsClass getInfoFromCache(Path path) {
@@ -115 +131 @@
     public FramsClass getInfoFromCache(String id) {
         assert isActive();
-        if (id == null) {
-                        return null;
-                }
-        if (infoCache.containsKey(id)) {
-            return infoCache.get(id);
-        }
-                return null;
-        }
-
-        protected final Map<String, Class> reflectedClasses = new HashMap<String, Class>();
-
-    public final void registerReflectedClass(String name, String className) {
-        assert isActive();
-        try {
-            registerReflectedClass(name, Class.forName(className));
-        } catch (ClassNotFoundException e) {
-            LOGGER.fatal("class not found during registration: " + e);
-        }
-    }
-
-    public void registerReflectedClass(String name, Class reflectedClass) {
-        assert isActive();
-        reflectedClasses.put(name, reflectedClass);
-        }
+                return registry.getInfoFromCache(id);
+        }
+
+        protected Registry registry = new Registry();
 
         public AccessInterface createAccess(String name) {
@@ -150 +146 @@
                 }
 
-                if (reflectedClasses.containsKey(name)) {
-                        return new ReflectionAccess(reflectedClasses.get(name), framsClass);
-                }
-
-                return new PropertiesAccess(framsClass);
+                return registry.createAccess(name, framsClass);
         }
 
@@ -188 +180 @@
         AccessInterface access = prepareAccess(node.getParam());
         if (access == null) {
+                        LOGGER.error("missing access for: " + node.getParam());
             return null;
         }
@@ -287 +280 @@
             }
         }
-        putInfoIntoCache(framsClass);
+        registry.putInfoIntoCache(framsClass);
         return framsClass;
     }
@@ -338 +331 @@
     }
 
-    public void registerTypicalReflectedClasses() {
-        registerReflectedClass("MechPart", "com.framsticks.model.MechPart");
-        registerReflectedClass("Joint", "com.framsticks.model.Joint");
-        registerReflectedClass("MechJoint", "com.framsticks.model.MechJoint");
-        registerReflectedClass("Neuro", "com.framsticks.model.Neuro");
-        registerReflectedClass("NeuroDef", "com.framsticks.model.NeuroDef");
-        registerReflectedClass("Part", "com.framsticks.model.Part");
-        registerReflectedClass("Creature", "com.framsticks.model.Creature");
-        registerReflectedClass("Genotype", "com.framsticks.model.Genotype");
-    }
-
     public static Iterator<String> splitPath(String path) {
         List<String> list = new LinkedList<String>();
@@ -359 +341 @@
     }
 
+        public Registry getRegistry() {
+                return registry;
+        }
 }
+