Changeset 2696

Timestamp:

03/09/10 18:18:10 (6 months ago)

Author:

mswertz

Message:

enhancement #75: enabled to set xref_label on entity level (again?)

Files:

• molgenis/3.3/src/org/molgenis/model/MolgenisModelValidator.java (modified) (1 diff)

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

@@ -59 +59 @@
                                 if (f.getType().equals(Field.Type.XREF_SINGLE) || f.getType().equals(Field.Type.XREF_MULTIPLE))
                                 {
-                                        if (!f.getXrefLabelsTemp().get(0).equals(f.getXrefFieldName()))
-                                        {
-                                                // Entity xref_entity =
-                                                // model.getEntity(f.getXRefEntity());
-                                                // f.setXrefLabels(xref_entity.getXrefLabels());
+                                        if (f.getXrefLabelNames().get(0).equals(f.getXrefFieldName()))
+                                        {
+                                                Entity xref_entity = f.getXrefEntity();
+                                                if(xref_entity.getXrefLabels() != null)
+                                                {
+                                                        logger.debug("copying xref_label "+xref_entity.getXrefLabels()+" from "+f.getXrefEntityName() + " to field "+f.getEntity().getName()+"."+f.getName());
+                                                        f.setXrefLabelNames(xref_entity.getXrefLabels());
+                                                }
                                         }
                                 }