Changeset 2693

Timestamp:

03/09/10 16:03:24 (6 months ago)

Author:

mswertz

Message:

bugfix #72: show column headers when an (automatically added) mref_entity is used in the user interface.

E.g. a field with entity="Experiment" name="Samples" type="mref" will produce a mref table ExperimentSamples?.
This entity can be shown in the UI if desired but had the bug described above.

Location:

molgenis/3.3/src/org/molgenis/model

Files:

• elements/Entity.java (modified) (1 diff)
• elements/Field.java (modified) (1 diff)
• MolgenisModelValidator.java (modified) (3 diffs)

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

@@ -150 +150 @@
         public String getLabel()
         {
+                if(label == null) return getName();
                 return this.label;
         }

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

@@ -411 +411 @@
         public String getLabel()
         {
+                if(label == null) return getName();
                 return this.label;
         }

molgenis/3.3/src/org/molgenis/model/MolgenisModelValidator.java

@@ -152 +152 @@
                                         if (linktable == null)
                                         {
-                                                linktable = new Entity(name, "", model.getDatabase());
+                                                linktable = new Entity(name, null, model.getDatabase());
                                                 linktable.setNamespace(xref_entity_from.getNamespace());
                                                 linktable.setAssociation(true);
@@ -163 +163 @@
                                                 Vector<Field> unique = new Vector<Field>();
 
-                                                field = new Field(linktable, Field.Type.XREF_SINGLE, xref_field_from.getMrefRemoteid(), "",
+                                                field = new Field(linktable, Field.Type.XREF_SINGLE, xref_field_from.getMrefRemoteid(), null,
                                                                 false, false, false, null);
                                                 field.setXRefVariables(xref_entity_to.getName(), xref_field_to.getName(), xref_field_from
@@ -173 +173 @@
                                                 for (Field key : xref_entity_from.getKeyFields(Entity.PRIMARY_KEY))
                                                 {
-                                                        field = new Field(linktable, Field.Type.XREF_SINGLE, xref_field_from.getMrefLocalid(), "",
+                                                        field = new Field(linktable, Field.Type.XREF_SINGLE, xref_field_from.getMrefLocalid(), null,
                                                                         false, false, false, null);