fix #6799: add totalCount of ticks as totalwork and start the progress monitor when...

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / markup / MarkupDocumentImportNoComponent.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
index 7dd8377d83776d527722fbd5bdd9e655d00b0f6e..69b0263f16dcf6abf5689185317c156b8f3a2b37 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java
@@ -341,6 +341,11 @@ public class MarkupDocumentImportNoComponent extends MarkupImportBase {
                                        fireWarningEvent(warning, next, 12);
                                        taxon.getName().setRank(Rank.UNKNOWN_RANK());
                                }
+                               //hybrid
+                               if (state.isTaxonIsHybrid() && !taxon.getName().isHybrid()){
+                                   fireWarningEvent("Taxon is hybrid but name is not a hybrid name", next, 4);
+                               }
+                               state.setTaxonIsHybrid(false);
 
                                keyImport.makeKeyNodes(state, parentEvent, taxonTitle);
                                state.setCurrentTaxon(null);
@@ -532,6 +537,7 @@ public class MarkupDocumentImportNoComponent extends MarkupImportBase {
                INonViralName name;
                Rank rank = null;  //Rank.SPECIES(); // default
                boolean isCultivar = checkAndRemoveAttributeValue(attributes, CLASS, "cultivated");
+
                if (isCultivar) {
                        name = TaxonNameFactory.NewCultivarInstance(rank);
                } else {
@@ -543,6 +549,8 @@ public class MarkupDocumentImportNoComponent extends MarkupImportBase {
                } else if (checkAndRemoveAttributeValue(attributes, CLASS, "excluded")) {
                        state.setCurrentTaxonExcluded(true);
                }
+        state.setTaxonIsHybrid(checkAndRemoveAttributeValue(attributes, CLASS, "hybrid"));
+
                // TODO insufficient, new, expected
                handleNotYetImplementedAttribute(attributes, CLASS, event);
                // From old version
@@ -576,7 +584,7 @@ public class MarkupDocumentImportNoComponent extends MarkupImportBase {
                                if (isMyEndingElement(next, parentEvent)) {
                                        Taxon taxon = state.getCurrentTaxon();
                                        String titleText = null;
-                                       if (checkMandatoryText(text, parentEvent)) {
+                                       if (state.getConfig().isDoExtensionForTaxonTitle() && checkMandatoryText(text, parentEvent)) {
                                                titleText = normalize(text);
                                                UUID uuidTitle = MarkupTransformer.uuidTaxonTitle;
                                                ExtensionType titleExtension = this.getExtensionType(state, uuidTitle, "Taxon Title ","taxon title", "title");