change removeTrailingDot to removeTrailingDots

diff --git a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
index 851654fc6ad2d75373be296d9678631b79141f63..0f74857106e82bdcb4dbb351cf3e1bd05834c61c 100644 (file)
--- a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
+++ b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
@@ -438,15 +438,13 @@ public class CdmUtils {
     }
 
     /**
-     * Trims the string and if the string ends with a dot removes it.
-     * @param string
-     * @return
+     * Trims the string and if the string ends with 1 or more dots removes it.
      */
-    public static String removeTrailingDot(String string){
+    public static String removeTrailingDots(String string){
         if (string == null){
             return null;
         }
-        if (string.trim().endsWith(".")){
+        while (string.trim().endsWith(".")){
             return string.substring(0, string.length() -1);
         }
         return string;

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
index 65eb51b0806261879acc94c95917a00ca471b8aa..fec0c3cc0726f3e7848d8b7c1a1b6bfc29c595f7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
@@ -2409,7 +2409,7 @@ public abstract class MarkupImportBase  {
                        XMLEvent next = readNoWhitespace(reader);
                        if (isMyEndingElement(next, parentEvent)) {
                                if (StringUtils.isNotBlank(text)) {
-                                       String label = CdmUtils.removeTrailingDot(normalize(text));
+                                       String label = CdmUtils.removeTrailingDots(normalize(text));
                                        TaxonDescription description = getExtractedMarkupMarkedDescription(state, taxon, sourceReference);
                                        NamedAreaLevel level = makeNamedAreaLevel(state,classValue, next);
 

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
index bee3192ce832132b659dade118cf8a1df3c45e2c..11b077a69a7af001c0040d3666503185ea92decc 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java
@@ -852,7 +852,7 @@ public class MarkupSpecimenImport extends MarkupImportBase  {
                                        if (isLocality) {
                                                facade.setLocality(text, getDefaultLanguage(state));
                                        } else {
-                                               text = CdmUtils.removeTrailingDot(text);
+                                               text = CdmUtils.removeTrailingDots(text);
                                                NamedArea area = makeArea(state, text, areaLevel);
                                                facade.addCollectingArea(area);
                                        }