ref #7346 create areas only if vocabulary does not yet exist

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / berlinModel / in / BerlinModelNameFactsImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java
index bb127096078ed679d54488b6ef056ad461297299..8f625466c39a3173c93b5805c086e19c510e4335 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java
@@ -54,11 +54,12 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 /**\r
  * @author a.mueller\r
  * @since 20.03.2008\r
- * @version 1.0\r
  */\r
 @Component\r
 public class BerlinModelNameFactsImport  extends BerlinModelImportBase  {\r
-       private static final Logger logger = Logger.getLogger(BerlinModelNameFactsImport.class);\r
+    private static final long serialVersionUID = 4174085686074314138L;\r
+\r
+    private static final Logger logger = Logger.getLogger(BerlinModelNameFactsImport.class);\r
 \r
        public static final String NAMESPACE = "NameFact";\r
 \r
@@ -75,8 +76,6 @@ public class BerlinModelNameFactsImport  extends BerlinModelImportBase  {
        }\r
 \r
 \r
-\r
-\r
        @Override\r
        protected String getIdQuery(BerlinModelImportState state) {\r
                if (StringUtils.isNotEmpty(state.getConfig().getNameIdTable())){\r
@@ -88,12 +87,6 @@ public class BerlinModelNameFactsImport  extends BerlinModelImportBase  {
                }\r
        }\r
 \r
-\r
-\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)\r
-        */\r
        @Override\r
        protected String getRecordQuery(BerlinModelImportConfigurator config) {\r
                String strQuery =\r
@@ -106,7 +99,7 @@ public class BerlinModelNameFactsImport  extends BerlinModelImportBase  {
        }\r
 \r
        @Override\r
-    public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
+    public boolean doPartition(@SuppressWarnings("rawtypes") ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
                boolean success = true ;\r
                BerlinModelImportConfigurator config = state.getConfig();\r
                Set<TaxonName> nameToSave = new HashSet<>();\r
@@ -173,7 +166,7 @@ public class BerlinModelNameFactsImport  extends BerlinModelImportBase  {
                                                        taxonNameBase.addDescription(description);\r
                                                }\r
                                        }else if (category.equalsIgnoreCase(NAME_FACT_BIBLIOGRAPHY)){\r
-                                               if (StringUtils.isNotBlank(nameFact)){\r
+                                               if (isNotBlank(nameFact)){\r
                                                        TaxonNameDescription description = TaxonNameDescription.NewInstance();\r
                                                        TextData bibliography = TextData.NewInstance(Feature.CITATION());\r
                                                        //TODO language\r