implement DOI class and use in Reference #3572

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java
index 7eef23f79d7a0f36e6915aa21210cc0118fc156b..9f1d6374bdb4f90fb2ec9f2cf3a83ac1549db8a2 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java
@@ -19,6 +19,7 @@ import org.apache.log4j.Logger;
 import org.joda.time.DateTime;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
+import eu.etaxonomy.cdm.common.DOI;\r
 import eu.etaxonomy.cdm.model.agent.Contact;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.LSID;\r
@@ -85,7 +86,8 @@ public abstract class StrategyBase implements IStrategy, Serializable {
                                fieldType == DateTime.class ||\r
                                fieldType == LSID.class ||\r
                                fieldType == Contact.class ||\r
-                               fieldType == URI.class\r
+                               fieldType == URI.class ||\r
+                               fieldType == DOI.class\r
                        ){\r
                                return true;\r
                }else{\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
index 2a11ae8b64ec414afebe16b475d0a8c6725918f2..bdea99a16b1c93b188262f19334551a7b3d87eb3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
@@ -52,7 +52,6 @@ import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStr
 /**\r
  * @author a.mueller\r
  * @created 03.08.2009\r
- * @version 1.0\r
  */\r
 public class DefaultMergeStrategyTest {\r
        @SuppressWarnings("unused")\r