Revert "Add flag for associating the ABCD unit with the field unit"

This reverts commit 55b1bb529f2938de88202fd3b51447cab3cc5b58.

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
index b24baae5902dfc77bbd67934fa7dce920c077243..bec35cefbf9ef6163b6dcced607abb1feb8299ab 100755 (executable)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
@@ -1151,8 +1151,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
                }
                save(state.getDerivedUnitBase(), state);
 
-               if ((config.isAddIndividualsAssociationsSuchAsSpecimenAndObservations() || config.isAddIndividualsAssociationsForFieldUnits())
-                       && preferredFlag) {
+               if (config.isAddIndividualsAssociationsSuchAsSpecimenAndObservations() && preferredFlag) {
                    //do not add IndividualsAssociation to non-preferred taxa
                    if (logger.isDebugEnabled()){
                        logger.debug("isDoCreateIndividualsAssociations");
@@ -1257,15 +1256,8 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
                state.setDescriptionGroup(taxonDescription);
 
                IndividualsAssociation indAssociation = IndividualsAssociation.NewInstance();
-               Feature feature;
-               if(state.getConfig().isAddIndividualsAssociationsForFieldUnits()){
-                   feature = makeFeature(state.getFieldUnit(state.getDataHolder().getFieldNumber()));
-                   indAssociation.setAssociatedSpecimenOrObservation(state.getFieldUnit(state.getDataHolder().getFieldNumber()));
-               }
-               else{
-                   feature = makeFeature(state.getDerivedUnitBase());
-                   indAssociation.setAssociatedSpecimenOrObservation(state.getDerivedUnitBase());
-               }
+               Feature feature = makeFeature(state.getDerivedUnitBase());
+               indAssociation.setAssociatedSpecimenOrObservation(state.getDerivedUnitBase());
                indAssociation.setFeature(feature);
 //
 //             if (((Abcd206ImportConfigurator) state.getConfig()).isInteractWithUser()){
@@ -1448,7 +1440,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
 
                if (type.isFeatureObservation()){
                    return Feature.OBSERVATION();
-               }else if (type.isFeatureSpecimen() || type.isFieldUnit()){
+               }else if (type.isFeatureSpecimen()){
                    return Feature.SPECIMEN();
                }else if (type == SpecimenOrObservationType.DerivedUnit){
                    return Feature.OBSERVATION();

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportConfiguratorBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportConfiguratorBase.java
index 250913aa69439086fe0c4baf607b2b11682ba4f7..a99b6e12e4fc996794b6cb4b7c46641302ad4620 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportConfiguratorBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportConfiguratorBase.java
@@ -55,7 +55,6 @@ public abstract class SpecimenImportConfiguratorBase<CONFIG extends SpecimenImpo
 
     private String taxonReference = null;
     private boolean addIndividualsAssociationsSuchAsSpecimenAndObservations = true;
-    private boolean addIndividualsAssociationsForFieldUnits = false;
     private boolean reuseExistingDescriptiveGroups = false;
 
 
@@ -151,14 +150,6 @@ public abstract class SpecimenImportConfiguratorBase<CONFIG extends SpecimenImpo
         this.addIndividualsAssociationsSuchAsSpecimenAndObservations = addIndividualsAssociationsSuchAsSpecimenAndObservations;
     }
 
-    public boolean isAddIndividualsAssociationsForFieldUnits() {
-        return addIndividualsAssociationsForFieldUnits;
-    }
-
-    public void setAddIndividualsAssociationsForFieldUnits(boolean addIndividualsAssociationsForFieldUnits) {
-        this.addIndividualsAssociationsForFieldUnits = addIndividualsAssociationsForFieldUnits;
-    }
-
     public boolean isReuseExistingDescriptiveGroups() {
         return reuseExistingDescriptiveGroups;
     }

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java
index 7d8c8f676dd056fc85d9640a810d7ca6b10ab34a..7f180c992254d5ca29a0b6b307d4e81b1613a346 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java
@@ -184,10 +184,6 @@ public String toString(){
       result.append(":");\r
       result.append(this.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());\r
       result.append(";");\r
-      result.append("addIndividualsAssociationsForFieldUnits");\r
-      result.append(":");\r
-      result.append(this.isAddIndividualsAssociationsForFieldUnits());\r
-      result.append(";");\r
       result.append("reuseExistingTaxaWhenPossible");\r
       result.append(":");\r
       result.append(this.isReuseExistingTaxaWhenPossible());\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImport.java
index a7ff3c3e66bb13caf01724d1a9db82023a0e69bd..7d85f98d00a4fd3fcce4b353b5e62ebf971cb6a5 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImport.java
@@ -318,8 +318,7 @@ public class GbifImport extends SpecimenImportBase<GbifImportConfigurator, Speci
             }
             if (bestMatchingName != null){
                 Taxon taxon = getOrCreateTaxonForName(bestMatchingName, state);
-                if (state.getConfig().isAddIndividualsAssociationsSuchAsSpecimenAndObservations()
-                        || state.getConfig().isAddIndividualsAssociationsForFieldUnits()) {
+                if (state.getConfig().isAddIndividualsAssociationsSuchAsSpecimenAndObservations()) {
                     //do not add IndividualsAssociation to non-preferred taxa
                     if(logger.isDebugEnabled()){
                         logger.info("isDoCreateIndividualsAssociations");