Merge branch 'master' into feature8162

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / app / wp6 / palmae / PalmaePostImportUpdater.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaePostImportUpdater.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaePostImportUpdater.java
index 160c66b97c2be0a3990119f8c91421230dd910e2..2133cd99ef304b2e22a6404f77482125d4cf134d 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaePostImportUpdater.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaePostImportUpdater.java
@@ -1,4 +1,3 @@
-// $Id$\r
 /**\r
 * Copyright (C) 2007 EDIT\r
 * European Distributed Institute of Taxonomy\r
@@ -27,7 +26,7 @@ import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.reference.IReference;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
@@ -36,7 +35,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 \r
 /**\r
  * @author a.mueller\r
- * @created 01.10.2009\r
+ * @since 01.10.2009\r
  */\r
 public class PalmaePostImportUpdater {\r
        private static final Logger logger = Logger.getLogger(PalmaePostImportUpdater.class);\r
@@ -165,7 +164,7 @@ public class PalmaePostImportUpdater {
         */\r
        private Taxon getAcceptedTreatmentTaxon(TaxonBase nameUsage, IReference treatmentReference) {\r
                boolean hasSynonymInTreatment = false;\r
-               TaxonNameBase name = nameUsage.getName();\r
+               TaxonName name = nameUsage.getName();\r
                Set<TaxonBase> candidateList = name.getTaxonBases();\r
                for (TaxonBase candidate : candidateList){\r
                        if (candidate instanceof Taxon){\r