BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
69f27ba
)
adding map to ReferenceSystem
author
Andreas Müller
<a.mueller@bgbm.org>
Wed, 7 May 2014 08:24:54 +0000
(08:24 +0000)
committer
Andreas Müller
<a.mueller@bgbm.org>
Wed, 7 May 2014 08:24:54 +0000
(08:24 +0000)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
patch
|
blob
|
history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java
patch
|
blob
|
history
diff --git
a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
index dee6b4af535f183c70cedffc10f3e389caf74d30..1adfd6f72adf09570242c41edd08a8d814704147 100644
(file)
--- a/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
+++ b/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java
@@
-193,6
+193,7
@@
public class InputTransformerBase implements IInputTransformer {
}else if (key.matches("(?i)(wgs84)")){return ReferenceSystem.WGS84();
\r
}else if (key.matches("(?i)(googleearth)")){return ReferenceSystem.GOOGLE_EARTH();
\r
}else if (key.matches("(?i)(gazetteer)")){return ReferenceSystem.GAZETTEER();
\r
}else if (key.matches("(?i)(wgs84)")){return ReferenceSystem.WGS84();
\r
}else if (key.matches("(?i)(googleearth)")){return ReferenceSystem.GOOGLE_EARTH();
\r
}else if (key.matches("(?i)(gazetteer)")){return ReferenceSystem.GAZETTEER();
\r
+ }else if (key.matches("(?i)(map)")){return ReferenceSystem.MAP();
\r
}else{
\r
String warning = "getReferenceSystemByKey is not implemented in implementing transformer class";
\r
throw new UndefinedTransformerMethodException(warning);
\r
}else{
\r
String warning = "getReferenceSystemByKey is not implemented in implementing transformer class";
\r
throw new UndefinedTransformerMethodException(warning);
\r
diff --git
a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java
b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java
index febf7818c5649b68f78f496747c8bfc1d6662f86..e18d82fdc79960fc30b5db0e8c900292e8ace879 100644
(file)
--- a/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java
+++ b/
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelTransformer.java
@@
-29,7
+29,6
@@
public final class SpecimenCdmExcelTransformer extends InputTransformerBase {
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(SpecimenCdmExcelTransformer.class);
\r
\r
@SuppressWarnings("unused")
\r
private static final Logger logger = Logger.getLogger(SpecimenCdmExcelTransformer.class);
\r
\r
- public static final UUID uuidRefSysMap = UUID.fromString("6d72d148-458a-42eb-97b0-9824abcffc91");
\r
public static final UUID uuidRefSysEstimated = UUID.fromString("3b625520-e5cf-4d9c-9599-0cb048e0e8d2");
\r
public static final UUID uuidRefSysLabel = UUID.fromString("c72335ed-c9aa-4d1c-b6fc-9f307d207862");
\r
public static final UUID uuidRefSysGps = UUID.fromString("b3c36751-b2ac-47f7-8ac1-3dc5c129e0b2");
\r
public static final UUID uuidRefSysEstimated = UUID.fromString("3b625520-e5cf-4d9c-9599-0cb048e0e8d2");
\r
public static final UUID uuidRefSysLabel = UUID.fromString("c72335ed-c9aa-4d1c-b6fc-9f307d207862");
\r
public static final UUID uuidRefSysGps = UUID.fromString("b3c36751-b2ac-47f7-8ac1-3dc5c129e0b2");
\r
@@
-66,7
+65,6
@@
public final class SpecimenCdmExcelTransformer extends InputTransformerBase {
@Override
\r
public UUID getReferenceSystemUuid(String key) throws UndefinedTransformerMethodException {
\r
if (StringUtils.isBlank(key)){return null;
\r
@Override
\r
public UUID getReferenceSystemUuid(String key) throws UndefinedTransformerMethodException {
\r
if (StringUtils.isBlank(key)){return null;
\r
- }else if (key.matches("(?i)(map)")){return uuidRefSysMap;
\r
}else if (key.matches("(?i)(estimated)")){return uuidRefSysEstimated;
\r
}else if (key.matches("(?i)(label)")){return uuidRefSysLabel;
\r
}else if (key.matches("(?i)(gps)")){return uuidRefSysLabel;
\r
}else if (key.matches("(?i)(estimated)")){return uuidRefSysEstimated;
\r
}else if (key.matches("(?i)(label)")){return uuidRefSysLabel;
\r
}else if (key.matches("(?i)(gps)")){return uuidRefSysLabel;
\r
@@
-77,8
+75,5
@@
public final class SpecimenCdmExcelTransformer extends InputTransformerBase {
}
\r
return null;
\r
}
\r
}
\r
return null;
\r
}
\r
-
\r
-
\r
-
\r
\r
}
\r
\r
}
\r