Changeset 79 for java/main/src/main/java/com/framsticks/examples/GenotypeBrowser.java

Timestamp:

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

Author:

psniegowski

Message:

Simplify f0 class organization.

File:

• java/main/src/main/java/com/framsticks/examples/GenotypeBrowser.java (modified) (2 diffs)

java/main/src/main/java/com/framsticks/examples/GenotypeBrowser.java

@@ -37 +37 @@
 
                 registry.putInfoIntoCache(new FramsClass("ModelBuilderRoot", "ModelBuilderRoot", null)
-                                .append(new ParamBuilder().setType("o Model").setId("f0genotype").setName("f0genotype").build())
-                                .append(new ParamBuilder().setType("o F0Model").setId("f0model").setName("f0model").build())
+                                .append(new ParamBuilder().setType("o Model").setId("model").setName("model").build())
                 );
                 root = new Node((CompositeParam)new ParamBuilder().setType("o ModelBuilderRoot").setId(name).setName("Instance").build(), PropertiesAccess.createPropertiesMap());
@@ -50 +49 @@
                         List<AccessInterface> accesses = new F0Parser(schema, GenotypeBrowser.class.getResourceAsStream("/examples/f0_example.txt")).parse();
                         List<Object> objects = Util.stripAccessInterface(accesses);
-                        F0Genotype f0Genotype = F0Genotype.build(objects);
-                        F0Model f0Model = F0Model.build(f0Genotype);
+                        Model model = Model.build(objects);
 
-                        for (String n : new String[] {"MechPart", "MechJoint", "Neuro"}) {
-                                registry.putInfoIntoCache(FramsClass.readFromStream(GenotypeBrowser.class.getResourceAsStream("/info/" + n + ".info")));
-                        }
                         AccessInterface rootAccess = bindAccess(new Path(this, "/"));
 
-                        rootAccess.set("f0genotype", f0Genotype);
-                        rootAccess.set("f0model", f0Model);
+                        rootAccess.set("model", model);
 
                 } catch (Exception e) {