ref #6369 adapt existing occurrences of interface to removed generics

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

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 29fa12b01ddb80e71f91d60285491a64674b9713..8e325481a183c9cc0b29d0aa2398ecb1c8cfa20b 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
@@ -75,6 +75,7 @@ import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
 import eu.etaxonomy.cdm.model.media.Media;
+import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
@@ -290,7 +291,7 @@ public abstract class MarkupImportBase  {
                }else if (cdmBase.isInstanceOf(DescriptionElementBase.class)){
                        docImport.getDescriptionService().saveDescriptionElement((DescriptionElementBase)cdmBase);
                }else if (cdmBase.isInstanceOf(Reference.class)){
-                       docImport.getReferenceService().saveOrUpdate((Reference<?>)cdmBase);
+                       docImport.getReferenceService().saveOrUpdate((Reference)cdmBase);
                }else{
                        String message = "Unknown cdmBase type to save: " + cdmBase.getClass();
                        fireWarningEvent(message, "Unknown location", 8);
@@ -1002,7 +1003,7 @@ public abstract class MarkupImportBase  {
                return StringUtils.isBlank(str);
        }
 
-       protected TaxonDescription getTaxonDescription(Taxon taxon, Reference<?> ref, boolean isImageGallery, boolean createNewIfNotExists) {
+       protected TaxonDescription getTaxonDescription(Taxon taxon, Reference ref, boolean isImageGallery, boolean createNewIfNotExists) {
                return docImport.getTaxonDescription(taxon, isImageGallery, createNewIfNotExists);
        }
 
@@ -1148,7 +1149,7 @@ public abstract class MarkupImportBase  {
        }
 
        protected void handleFullName(MarkupImportState state, XMLEventReader reader,
-                       NonViralName<?> name, XMLEvent next) throws XMLStreamException {
+                       INonViralName name, XMLEvent next) throws XMLStreamException {
                String fullNameStr;
                Map<String, Attribute> attrs = getAttributes(next);
                String rankStr = getAndRemoveRequiredAttributeValue(next,
@@ -1577,7 +1578,9 @@ public abstract class MarkupImportBase  {
                        XMLEvent next = readNoWhitespace(reader);
                        if (isMyEndingElement(next, parentEvent)) {
                                if (isNotBlank(text)){
-                                       fireWarningEvent("Text not yet handled for figures: " + text, next, 4);
+                                   if (isNeglectableFigureText(text)){
+                                       fireWarningEvent("Text not yet handled for figures: " + text, next, 4);
+                                   }
                                }
                                Media media = makeFigure(state, id, type, urlString, legendString, titleString, numString, next);
                                return media;
@@ -1599,7 +1602,7 @@ public abstract class MarkupImportBase  {
                        } else if (isStartingElement(next, NUM)) {
                                numString = getCData(state, reader, next);
                        } else if (next.isCharacters()) {
-                               text += CdmUtils.concat("", text, next.asCharacters().getData());
+                               text = CdmUtils.concat("", text, next.asCharacters().getData());
                        } else {
                                fireUnexpectedEvent(next, 0);
                        }
@@ -1609,6 +1612,19 @@ public abstract class MarkupImportBase  {
 
 
        /**
+     * @param text2
+     * @return
+     */
+    private boolean isNeglectableFigureText(String text) {
+        if (text.matches("Fig\\.*")){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+
+    /**
         * @param state
         * @param id
         * @param type
@@ -1650,7 +1666,7 @@ public abstract class MarkupImportBase  {
                                if (StringUtils.isNotBlank(numString)) {
                                        // TODO use concrete source (e.g. DAPHNIPHYLLACEAE in FM
                                        // vol.13)
-                                       Reference<?> citation = state.getConfig().getSourceReference();
+                                       Reference citation = state.getConfig().getSourceReference();
                                        media.addSource(OriginalSourceType.Import, numString, "num", citation, null);
                                        // TODO name used in source if available
                                }
@@ -1819,7 +1835,7 @@ public abstract class MarkupImportBase  {
        }
 
        private String handleInLineReference(MarkupImportState state,XMLEventReader reader, XMLEvent parentEvent, MarkupNomenclatureImport nomenclatureImport)throws XMLStreamException {
-               Reference<?> reference = nomenclatureImport.handleReference(state, reader, parentEvent);
+               Reference reference = nomenclatureImport.handleReference(state, reader, parentEvent);
                String result = "<cdm:ref uuid='%s'>%s</ref>";
                result = String.format(result, reference.getUuid(), reference.getTitleCache());
                save(reference, state);
@@ -2012,7 +2028,7 @@ public abstract class MarkupImportBase  {
 
                Taxon taxon = state.getCurrentTaxon();
                // TODO which ref to take?
-               Reference<?> ref = state.getConfig().getSourceReference();
+               Reference ref = state.getConfig().getSourceReference();
 
                String text = "";
                while (reader.hasNext()) {