isEmpty > isBlank

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / cyprus / CyprusTransformer.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusTransformer.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusTransformer.java
index 5538468d9d34f017197db9545fa8944f3f5f9c25..8f595b2b5fdbcae0c15e9079c2059ef33749d60d 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusTransformer.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusTransformer.java
@@ -12,13 +12,13 @@ package eu.etaxonomy.cdm.io.cyprus;
 \r
 import java.util.UUID;\r
 \r
+import org.apache.commons.lang.StringUtils;\r
 import org.apache.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
-import eu.etaxonomy.cdm.model.description.Feature;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -50,6 +50,9 @@ public final class CyprusTransformer extends InputTransformerBase {
        public static final UUID cultivatedDoubtfulUuid = UUID.fromString("4f31bfc8-3058-4d83-aea5-3a1fe9773f9f");\r
        \r
        //Named Area - divisions \r
+       public static final UUID uuidCyprusDivisionsVocabulary = UUID.fromString("2119f610-1f93-4d87-af28-40aeefaca100");\r
+       public static final UUID uuidCyprusDivisionsAreaLevel = UUID.fromString("ff52bbd9-f73d-4476-af39-f3991fa892bd");\r
+       \r
        public static final UUID uuidDivision1 = UUID.fromString("ab17eee9-1abb-4ce9-a9a2-563f840cdbfc");\r
        public static final UUID uuidDivision2 = UUID.fromString("c3606165-efb7-4224-a168-63e009eb4aa5");\r
        public static final UUID uuidDivision3 = UUID.fromString("750d4e07-e34b-491f-a7b7-09723afdc960");\r
@@ -67,7 +70,7 @@ public final class CyprusTransformer extends InputTransformerBase {
         */\r
        @Override\r
        public MarkerType getMarkerTypeByKey(String key) throws UndefinedTransformerMethodException {\r
-               if (CdmUtils.isEmpty(key)){return null;\r
+               if (StringUtils.isBlank(key)){return null;\r
 //             }else if (key.equalsIgnoreCase("distribution")){return MarkerType.;\r
 //             }else if (key.equalsIgnoreCase("habitatecology")){return Feature.ECOLOGY();\r
                }else{\r
@@ -77,7 +80,7 @@ public final class CyprusTransformer extends InputTransformerBase {
 \r
        @Override\r
        public UUID getMarkerTypeUuid(String key) throws UndefinedTransformerMethodException {\r
-               if (CdmUtils.isEmpty(key)){return null;\r
+               if (StringUtils.isBlank(key)){return null;\r
 //             }else if (key.equalsIgnoreCase("IMPERFECTLY KNOWN SPECIES")){return uuidIncompleteTaxon;\r
                }else{\r
                        return null;\r
@@ -87,7 +90,7 @@ public final class CyprusTransformer extends InputTransformerBase {
        \r
        @Override\r
        public UUID getPresenceTermUuid(String key) throws UndefinedTransformerMethodException {\r
-               if (CdmUtils.isEmpty(key)){return null;\r
+               if (StringUtils.isBlank(key)){return null;\r
                }else if (key.equalsIgnoreCase("IN")){return indigenousUuid;\r
                }else if (key.equalsIgnoreCase("CA")){return casualUuid;\r
                }else if (key.equalsIgnoreCase("NN")){return nonInvasiveUuid;\r
@@ -107,7 +110,7 @@ public final class CyprusTransformer extends InputTransformerBase {
        \r
        @Override\r
        public UUID getFeatureUuid(String key) throws UndefinedTransformerMethodException {\r
-               if (CdmUtils.isEmpty(key)){return null;\r
+               if (StringUtils.isBlank(key)){return null;\r
                }else if (key.equalsIgnoreCase("Red book")){return redBookUuid;\r
                }else if (key.equalsIgnoreCase("Endemism")){return endemismUuid;\r
                }else{\r
@@ -118,7 +121,7 @@ public final class CyprusTransformer extends InputTransformerBase {
 \r
        @Override\r
        public UUID getNamedAreaUuid(String key) throws UndefinedTransformerMethodException {\r
-               if (CdmUtils.isEmpty(key)){return null;\r
+               if (StringUtils.isBlank(key)){return null;\r
                }else if (key.equalsIgnoreCase("1")){return uuidDivision1;\r
                }else if (key.equalsIgnoreCase("2")){return uuidDivision2;\r
                }else if (key.equalsIgnoreCase("3")){return uuidDivision3;\r
@@ -129,7 +132,8 @@ public final class CyprusTransformer extends InputTransformerBase {
                }else if (key.equalsIgnoreCase("8")){return uuidDivision8;\r
                }else{\r
                        return null;\r
-               }       }\r
+               }       \r
+       }\r
        \r
        \r
        \r