make collector number deprecated in DerivedUnitBase and remove from specimen facade...

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java
index 6aac8dca51e799af101acc7ced30bd36fd0d6355..3ed657ceb00171bb8aa7ae0762ebeaaa471c9e31 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java
@@ -31,7 +31,7 @@ public class Abcd206DataHolder {
        protected String unitID;\r
        protected String recordBasis;\r
        protected String accessionNumber;\r
-       protected String collectorsNumber;\r
+//     protected String collectorsNumber;\r
        \r
        protected String fieldNumber;\r
        protected Double longitude;\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
index f547a7746c0280fd36a6bd8d0e692ed1c9846aaf..8f10d0b07ab97c6e7b0fcd197e6d6aae841ef5db 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
@@ -216,7 +216,7 @@ public class Abcd206Import extends SpecimenImportBase<Abcd206ImportConfigurator,
                //set catalogue number (unitID)
                derivedUnitFacade.setCatalogNumber(dataHolder.unitID);
                derivedUnitFacade.setAccessionNumber(dataHolder.accessionNumber);
-               derivedUnitFacade.setCollectorsNumber(dataHolder.collectorsNumber);
+//             derivedUnitFacade.setCollectorsNumber(dataHolder.collectorsNumber);
 
 
                /**
@@ -799,16 +799,16 @@ public class Abcd206Import extends SpecimenImportBase<Abcd206ImportConfigurator,
                        dataHolder.fieldNumber = "";
                }
 
-               try {
-                       group = root.getElementsByTagName("CollectorsNumber");
-                       path=group.item(0).getNodeName();
-                       getHierarchie(group.item(0));
-                       dataHolder.knownABCDelements.add(path);
-                       path="";
-                       dataHolder.collectorsNumber = group.item(0).getTextContent();
-               } catch (NullPointerException e) {
-                       dataHolder.collectorsNumber = "";
-               }
+//             try {
+//                     group = root.getElementsByTagName("CollectorsNumber");
+//                     path=group.item(0).getNodeName();
+//                     getHierarchie(group.item(0));
+//                     dataHolder.knownABCDelements.add(path);
+//                     path="";
+//                     dataHolder.collectorsNumber = group.item(0).getTextContent();
+//             } catch (NullPointerException e) {
+//                     dataHolder.collectorsNumber = "";
+//             }
 
                try {
                        group = root.getElementsByTagName("AccessionNumber");

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnitBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnitBase.java
index f6ac13b4e4992d3f86a94fab4539e74d035178ad..bfada99426bde5858ac3a1e526f1f181617118c4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnitBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnitBase.java
@@ -199,10 +199,24 @@ public abstract class DerivedUnitBase<S extends IIdentifiableEntityCacheStrategy
                this.accessionNumber = accessionNumber;
        }
        
+       /**
+        * Will be removed in future versions as semantics is not clear.
+        * For accessing the collecting number use 
+        * {@link FieldObservation#getFieldNumber()} instead.
+        * @return
+        */
+       @Deprecated
        public String getCollectorsNumber() {
                return collectorsNumber;
        }
        
+       /**
+        * Will be removed in future versions as semantics is not clear.
+        * For editing the collecting number use 
+        * {@link FieldObservation#getFieldNumber()} instead.
+        * @return
+        */
+       @Deprecated
        public void setCollectorsNumber(String collectorsNumber) {
                this.collectorsNumber = collectorsNumber;
        }

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java
index e4adcf2d8c520f67cba30c98efb42bad42dade1c..11ab44e6e696e0627fed60ec283b3537ffa43697 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java
@@ -90,7 +90,7 @@ public class DerivedUnitFacadeBeanProcessor extends AbstractBeanProcessor<Derive
                                /* Skip - Only supported by specimen and fossils */\r
                        }                       \r
                        addJsonElement(json, jsonConfig, "storedUnder", bean.getStoredUnder());\r
-                       addJsonElement(json, jsonConfig, "collectorsNumber", bean.getCollectorsNumber());\r
+//                     addJsonElement(json, jsonConfig, "collectorsNumber", bean.getCollectorsNumber());\r
                        try {\r
                                addJsonElement(json, jsonConfig, "exsiccatum", bean.getExsiccatum());\r
                        } catch (MethodNotSupportedByDerivedUnitTypeException e) {\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
index ff6815e2df9fc0713b98731bbaad9308dd2e608c..4e2f3157b2f93386aa2741c46872ae4d81e9f58f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
@@ -1906,15 +1906,16 @@ public class DerivedUnitFacade {
                derivedUnit.setStoredUnder(storedUnder);\r
        }\r
 \r
-       // colletors number\r
-       @Transient\r
-       public String getCollectorsNumber() {\r
-               return derivedUnit.getCollectorsNumber();\r
-       }\r
-\r
-       public void setCollectorsNumber(String collectorsNumber) {\r
-               this.derivedUnit.setCollectorsNumber(collectorsNumber);\r
-       }\r
+       \r
+//     // colletors number\r
+//     @Transient\r
+//     public String getCollectorsNumber() {\r
+//             return derivedUnit.getCollectorsNumber();\r
+//     }\r
+//\r
+//     public void setCollectorsNumber(String collectorsNumber) {\r
+//             this.derivedUnit.setCollectorsNumber(collectorsNumber);\r
+//     }\r
 \r
        // title cache\r
        public String getTitleCache() {\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
index 3ca1beee2a73b7e36d2c784a24c438c5c1fe2c99..a27d11c8eb1d3c5c7673ad319e57b53caabca0f6 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java
@@ -1317,19 +1317,19 @@ public class DerivedUnitFacadeTest extends CdmTransactionalIntegrationTest {
                                specimenFacade.getStoredUnder());\r
        }\r
 \r
-       /**\r
-        * Test method for\r
-        * {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#getCollectorsNumber()}\r
-        * .\r
-        */\r
-       @Test\r
-       public void testGetSetCollectorsNumber() {\r
-               Assert.assertEquals("Collectors number must be same", collectorsNumber,\r
-                               specimenFacade.getCollectorsNumber());\r
-               specimenFacade.setCollectorsNumber("C12345693");\r
-               Assert.assertEquals("New collectors number must be 'C12345693'",\r
-                               "C12345693", specimenFacade.getCollectorsNumber());\r
-       }\r
+//     /**\r
+//      * Test method for\r
+//      * {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#getCollectorsNumber()}\r
+//      * .\r
+//      */\r
+//     @Test\r
+//     public void testGetSetCollectorsNumber() {\r
+//             Assert.assertEquals("Collectors number must be same", collectorsNumber,\r
+//                             specimenFacade.getCollectorsNumber());\r
+//             specimenFacade.setCollectorsNumber("C12345693");\r
+//             Assert.assertEquals("New collectors number must be 'C12345693'",\r
+//                             "C12345693", specimenFacade.getCollectorsNumber());\r
+//     }\r
 \r
        /**\r
         * Test method for\r