Changeset 2592

Timestamp:

01/26/10 13:12:53 (2 years ago)

Author:

mswertz

Message:

enhancement: first start with molgenis:#61 untested!

Location:

molgenis/3.3/src/org/molgenis

Files:

• generators/DataTypeGen.java.ftl (modified) (1 diff)
• generators/ui/FormScreenGen.java.ftl (modified) (1 diff)
• model/elements/Entity.java (modified) (5 diffs)
• model/elements/Form.java (modified) (2 diffs)

molgenis/3.3/src/org/molgenis/generators/DataTypeGen.java.ftl

@@ -544 +544 @@
         public String getIdField()
         {
-                return "${name(pkey(entity))}";
+                return "${pkey(entity).name}";
         }
 

molgenis/3.3/src/org/molgenis/generators/ui/FormScreenGen.java.ftl

@@ -154 +154 @@
                         <#if inputtype = "Xref" || inputtype = "Mref">
                         <#assign xref_entity = model.getEntity(field.XRefEntity)>
-                        input.setXrefEntity("${xref_entity.getNamespace()}.${field.XRefEntity}");
+                        input.setXrefEntity("${xref_entity.getNamespace()}.${JavaName(field.XRefEntity)}");
                         input.setXrefField("${name(field.XRefField)}");
                         input.setXrefLabel("${name(field.XRefLabelString)}");

molgenis/3.3/src/org/molgenis/model/elements/Entity.java

@@ -531 +531 @@
                 Vector<Field> fields = getAncestor().getAllFields();
                 for(Field f : fields) {
-                        if(f.getName().toLowerCase().equals(fieldname.toLowerCase())) {
+                        if(f.getName().equals(fieldname)) {
                                 return true;
                         }
@@ -552 +552 @@
                         {
                                 ifaceField.setEntity(this);
-                                        all_fields.put(ifaceField.getName().toLowerCase(), ifaceField);
+                                        all_fields.put(ifaceField.getName(), ifaceField);
                         }
                 }
@@ -561 +561 @@
                         for (Field f : getAncestor().getAllFields())
                         {
-                                all_fields.put(f.getName().toLowerCase(), f);
+                                all_fields.put(f.getName(), f);
                         }
                 }
@@ -568 +568 @@
                 for (Field f : getFields())
                 {
-                        all_fields.put(f.getName().toLowerCase(), f);
+                        all_fields.put(f.getName(), f);
                 }
 
@@ -812 +812 @@
                 for (Field field : getFields())
                 {
-                        if (name.toLowerCase().equals(field.getName().toLowerCase()))
+                        if (name.equals(field.getName()))
                         {
                                 return field;

molgenis/3.3/src/org/molgenis/model/elements/Form.java

@@ -10 +10 @@
 package org.molgenis.model.elements;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -190 +191 @@
         private String embedfields;
 
+        /**
+         * Option to have a compact view only showing the assigned fields..
+         * The other fields will be 'collapsed' with a '+' to uncollapse them.
+         */
+        private List<String> compact_fields = new ArrayList<String>();
+        
         /** */
         private static final long serialVersionUID = -2642011592737487306L;