(no commit message)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
index 0d4ed01cd33686a39f94ee4aaca59c06444746c8..c7f8629cdc1a32525e119ef3427006b9bb831bb8 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java
@@ -41,7 +41,9 @@ import javax.xml.bind.annotation.XmlType;
 public class Synonym extends TaxonBase implements IRelated<SynonymRelationship>{
        
        static Logger logger = Logger.getLogger(Synonym.class);
-       
+
+       //@XmlTransient
+       // Don't need the synonym relations here since they are stored at taxon side?
        @XmlElementWrapper(name = "SynonymRelations")
        @XmlElement(name = "SynonymRelationship")
        private Set<SynonymRelationship> synonymRelations = new HashSet<SynonymRelationship>();

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DataSetTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DataSetTest.java
index 6bf97ac3341bc1f47c9fff5e120cf5cded417b19..eab55e9a861d1c13c2e1ead38a2950b000e31b91 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DataSetTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DataSetTest.java
@@ -1,9 +1,12 @@
 package eu.etaxonomy.cdm.model;\r
 \r
 import java.util.ArrayList;\r
+import java.util.Collection;\r
 import java.util.GregorianCalendar;\r
+import java.util.HashSet;\r
 import java.util.Iterator;\r
 import java.util.List;\r
+import java.util.Set;\r
 \r
 import junit.framework.Assert;\r
 \r
@@ -18,6 +21,7 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Keyword;\r
+import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
@@ -35,6 +39,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 public class DataSetTest {\r
@@ -48,6 +53,8 @@ public class DataSetTest {
     private List<Taxon> taxa;\r
     private List<Synonym> synonyms;\r
     private List<AnnotatableEntity> homotypicalGroups;\r
+       Set<TaxonRelationship> taxonRelationships;\r
+       Set<RelationshipBase> relationshipBases;\r
        \r
        @Before\r
        public void onSetUp() throws Exception {\r
@@ -73,6 +80,7 @@ public class DataSetTest {
                taxonomicNames = new ArrayList<TaxonNameBase>();\r
                taxa = new ArrayList<Taxon>();\r
                synonyms = new ArrayList<Synonym>();\r
+       taxonRelationships = new HashSet();\r
                \r
                StrictReferenceBase citRef, sec;\r
                BotanicalName name1, name2, nameRoot, nameFree, synName11, synName12, synName2, synNameFree;\r
@@ -198,6 +206,9 @@ public class DataSetTest {
                synonyms.add(syn12);\r
                synonyms.add(syn2);\r
                \r
+               // relationships\r
+               \r
+               \r
                // taxonomic children\r
                \r
                rootT.addTaxonomicChild(child1, sec, "p.998");\r
@@ -208,6 +219,15 @@ public class DataSetTest {
                taxa.add(child1);\r
                taxa.add(child2);\r
                \r
+//         List<Taxon> taxa;\r
+//     Object obj = (Object)taxa;\r
+//     Collection<TaxonBase> taxonBases = (Collection<TaxonBase>)obj;\r
+\r
+//             Set<TaxonRelationship> taxonRelationships;\r
+       taxonRelationships = rootT.getTaxonRelations();\r
+       Object obj = (Object)taxonRelationships;\r
+       relationshipBases = (Set<RelationshipBase>)obj;\r
+               \r
        }\r
                \r
        public DataSet buildDataSet(boolean persistentContext) {\r
@@ -221,6 +241,7 @@ public class DataSetTest {
                dataSet.setTaxonomicNames(taxonomicNames);\r
                dataSet.setTaxa(taxa);\r
                dataSet.setSynonyms(synonyms);\r
+               dataSet.setRelationships(relationshipBases);\r
 \r
                return dataSet;\r
        }\r