ref #7666 adding NARROW NO-BREAK after doubtful marker

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
index 0ce3855fcb619aaae1aef4924ee5bec679c3ad85..9b93679bd1eb439a91549484439d28c30e78f427 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java
@@ -95,7 +95,7 @@ public class TcsXmlTaxonRelationsImport extends TcsXmlImportBase implements ICdm
                ResultWrapper<Boolean> success = ResultWrapper.NewInstance(true);\r
                String childName;\r
                boolean obligatory;\r
-               String idNamespace = "TaxonRelation";\r
+               String idNamespace = "TaxonRelationDTO";\r
 \r
                TcsXmlImportConfigurator config = state.getConfig();\r
                Element elDataSet = super.getDataSetElement(config);\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
index 3cab85a5165c514c1e03eb4f8de3c2e0a15394ad..e9d6f11e579e8e6f2b92187f2212fb53ef0138ef 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/taxon/TaxonRelationshipFormatter.java
@@ -70,7 +70,7 @@ public class TaxonRelationshipFormatter {
             return null;
         }
 
-        String doubtfulTaxonStr = relatedTaxon.isDoubtful() ? "?" : "";
+        String doubtfulTaxonStr = relatedTaxon.isDoubtful() ? "?\u202F" : "";
         String doubtfulRelationStr = taxonRelationship.isDoubtful() ? "?" : "";
 
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SourceDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SourceDTO.java
new file mode 100644 (file)
index 0000000..5da671b
--- /dev/null
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SourceDTO.java
@@ -0,0 +1,24 @@
+/**
+* Copyright (C) 2018 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.cdm.api.service.dto;
+
+import java.util.UUID;
+
+/**
+ * @author a.kohlbecker
+ * @since Aug 31, 2018
+ *
+ */
+public class SourceDTO {
+
+    private UUID uuid;
+    String citation;
+    String citationDetail;
+
+}

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
index 2290875a1fef1f1917b37a1cc7ae5aa2eeb8c685..8b899d5fc9e7ec89dbc2912be6fa183179fbfe04 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTO.java
@@ -38,9 +38,8 @@ public class TaxonRelationshipsDTO {
 
     private static final String SENSU_SEPARATOR = ", ";
 
-    public class TaxonRelation{
+    public class TaxonRelationDTO{
 
-        private UUID relationUuid;
         private boolean doubtful = false;
         private boolean misapplication = false;
         private boolean synonym = false;
@@ -51,14 +50,15 @@ public class TaxonRelationshipsDTO {
         //TODO maybe this will be changed in future
         private TermDto type;
         private UUID typeUuid;
+        private SourceDTO sec;
+        private SourceDTO relSec;
 
 
-        public TaxonRelation(TaxonRelationship relation, Direction direction, List<Language> languages) {
+        public TaxonRelationDTO(TaxonRelationship relation, Direction direction, List<Language> languages) {
             Taxon relatedTaxon = direction == Direction.relatedTo? relation.getToTaxon()
                     : relation.getFromTaxon();
             this.taxonUuid = relatedTaxon.getUuid();
             this.doubtful = relation.isDoubtful();
-            this.relationUuid = relation.getUuid();
             this.direction = direction;
             TaxonRelationshipType relType = relation.getType();
 
@@ -93,12 +93,6 @@ public class TaxonRelationshipsDTO {
         public void setDoubtful(boolean doubtful) {
             this.doubtful = doubtful;
         }
-        public UUID getRelationUuid() {
-            return relationUuid;
-        }
-        public void setRelationUuid(UUID relationUuid) {
-            this.relationUuid = relationUuid;
-        }
 
         public Direction getDirection() {
             return direction;
@@ -167,7 +161,7 @@ public class TaxonRelationshipsDTO {
 
     }
 
-    private List<TaxonRelation> relations = new ArrayList<>();
+    private List<TaxonRelationDTO> relations = new ArrayList<>();
 
     private List<List<TaggedText>> misapplications = new ArrayList<>();
 
@@ -184,15 +178,15 @@ public class TaxonRelationshipsDTO {
 
  // ************************** GETTER / SETTER  ***********************/
 
-    public List<TaxonRelation> getRelations() {
+    public List<TaxonRelationDTO> getRelations() {
         return relations;
     }
 
-    public void setIncludedTaxa(List<TaxonRelation> relations) {
+    public void setIncludedTaxa(List<TaxonRelationDTO> relations) {
         this.relations = relations;
     }
 
-    public void addRelation(TaxonRelation relation){
+    public void addRelation(TaxonRelationDTO relation){
         relations.add(relation);
     }
 
@@ -200,8 +194,8 @@ public class TaxonRelationshipsDTO {
      * @param relation
      * @param direction
      */
-    public TaxonRelation addRelation(TaxonRelationship relation, Direction direction, List<Language> languages) {
-        TaxonRelation newRelation = new TaxonRelation(relation, direction, languages);
+    public TaxonRelationDTO addRelation(TaxonRelationship relation, Direction direction, List<Language> languages) {
+        TaxonRelationDTO newRelation = new TaxonRelationDTO(relation, direction, languages);
         relations.add(newRelation);
         return newRelation;
     }
@@ -213,7 +207,7 @@ public class TaxonRelationshipsDTO {
     public void createMisapplicationString() {
         List<List<TaggedText>> result = new ArrayList<>();
 
-        for (TaxonRelation relation: relations){
+        for (TaxonRelationDTO relation: relations){
             if (relation.isMisapplication()){
                 List<TaggedText> tags = relation.getTaggedText();
 
@@ -331,7 +325,7 @@ public class TaxonRelationshipsDTO {
     }
 //
 //    public boolean contains(UUID taxonUuid) {
-//        for (TaxonRelation relation: relations){
+//        for (TaxonRelationDTO relation: relations){
 //            if (taxon.taxonUuid.equals(taxonUuid)){
 //                return true;
 //            }
@@ -342,7 +336,7 @@ public class TaxonRelationshipsDTO {
     @Override
     public String toString(){
         String result = "";
-        for (TaxonRelation relation : relations){
+        for (TaxonRelationDTO relation : relations){
             result += relation.toString() + ",";
         }
         if (result.length() > 0){

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
index 22991d7945281abb63e3669b00731b2fb376b754..bfa2c63a5670f303b8e7408157551cc01398fb8d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/dto/TaxonRelationshipsDTOTest.java
@@ -15,7 +15,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import eu.etaxonomy.cdm.api.service.dto.TaxonRelationshipsDTO.TaxonRelation;
+import eu.etaxonomy.cdm.api.service.dto.TaxonRelationshipsDTO.TaxonRelationDTO;
 import eu.etaxonomy.cdm.format.taxon.TaxonRelationshipFormatter;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
@@ -134,9 +134,9 @@ public class TaxonRelationshipsDTOTest {
 
         dto.addRelation(taxonRel, Direction.relatedFrom, languages);
         dto.addRelation(rel2, Direction.relatedFrom, languages);
-        TaxonRelation relToDuplicate = dto.addRelation(rel3, Direction.relatedFrom, languages);
+        TaxonRelationDTO relToDuplicate = dto.addRelation(rel3, Direction.relatedFrom, languages);
         dto.addRelation(rel4, Direction.relatedFrom, languages);
-        TaxonRelation duplicateWithoutRelSec2 = dto.addRelation(rel5, Direction.relatedFrom, languages);
+        TaxonRelationDTO duplicateWithoutRelSec2 = dto.addRelation(rel5, Direction.relatedFrom, languages);
 
         dto.createMisapplicationString();