Type module largely complete.

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / propertysheet / type / TypeCollectionPropertySource.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
index 6f0183cabde03fe4831a6980caea2657aac2a067..ba0ebe620403f1e1940f9dcf60d5c858b9d259a0 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/TypeCollectionPropertySource.java
@@ -14,8 +14,8 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
+import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
 import eu.etaxonomy.taxeditor.controller.GlobalController;\r
 import eu.etaxonomy.taxeditor.propertysheet.CollectionPropertySource;\r
 \r
@@ -24,60 +24,42 @@ public class TypeCollectionPropertySource extends CollectionPropertySource {
                        .getLogger(TypeCollectionPropertySource.class);\r
        \r
        private TaxonNameBase name;\r
-       private boolean isZoological = false;\r
 \r
        public TypeCollectionPropertySource(TaxonNameBase name, Collection collection) {\r
                super(collection);\r
                this.name = name;\r
-               if (name instanceof ZoologicalName) {\r
-                       isZoological = true;\r
-               }\r
        }\r
        \r
        @Override\r
        protected String getItemDisplayName(Object item) {\r
-               String itemDisplayName = "";\r
+               String str = "";\r
                \r
-               if (item instanceof NameRelationship) {\r
-                       \r
-                       NameRelationship nameRelation = (NameRelationship) item;\r
+               if (item instanceof SpecimenTypeDesignation) {\r
                        \r
-                       if (nameRelation.getFromName() instanceof ZoologicalName &&\r
-                                       nameRelation.getToName() instanceof ZoologicalName) {\r
-                               isZoological = true;    \r
-                       }\r
+                       SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation) item;\r
                        \r
-                       if (nameRelation.getType() != null) {\r
-                               \r
-                               NameRelationshipType type = nameRelation.getType();\r
-                               String label = GlobalController.getNameRelationLabelType(type);\r
-                               if (isZoological && \r
-                                               nameRelation.getType().equals(NameRelationshipType.BASIONYM())) {\r
-                                       label = "original combination";\r
-                               }\r
-                               itemDisplayName = label;\r
-                       } else {\r
-                               itemDisplayName = "Relation has no type";\r
+                       if (typeDesignation.getTypeStatus() != null) {\r
+                               str = typeDesignation.getTypeStatus().getLabel();\r
                        }\r
                }\r
-               return itemDisplayName;\r
+               return str;\r
        }\r
 \r
        @Override\r
        public Object getPropertyValue(Object id) {\r
-               if (id instanceof NameRelationship) {\r
-                       TaxonNameBase relatedName;\r
-                       String nameValue;\r
-                       if (((NameRelationship) id).getFromName().equals(name)) {\r
-                               relatedName = ((NameRelationship) id).getToName();\r
-                               nameValue = relatedName.getTitleCache();\r
+               String str = "";\r
+               \r
+               if (id instanceof SpecimenTypeDesignation) {\r
+                       \r
+                       SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation) id;\r
+                                               \r
+                       if (typeDesignation.getTypeSpecimen() != null) {\r
+                               str = typeDesignation.getTypeSpecimen().getTitleCache();\r
                        } else {\r
-                               relatedName = ((NameRelationship) id).getFromName();\r
-                               nameValue = "to " + relatedName.getTitleCache();\r
+                               str = "UNDEFINED";\r
                        }\r
-                       return nameValue;\r
                }\r
-               return null;\r
+               return str;\r
        }\r
 \r
        @Override\r