From caa2350dbbf15969556dc886f0f0a7cea51950aa Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Fri, 6 Sep 2019 09:36:29 +0200
Subject: [PATCH] Revert "Add flag for associating the ABCD unit with the field
 unit"

This reverts commit 55b1bb529f2938de88202fd3b51447cab3cc5b58.
---
 .../cdm/io/specimen/SpecimenImportBase.java      | 16 ++++------------
 .../specimen/SpecimenImportConfiguratorBase.java |  9 ---------
 .../abcd206/in/Abcd206ImportConfigurator.java    |  4 ----
 .../cdm/io/specimen/gbif/in/GbifImport.java      |  3 +--
 4 files changed, 5 insertions(+), 27 deletions(-)

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 b24baae590..bec35cefbf 100755
--- 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 250913aa69..a99b6e12e4 100644
--- 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 7d8c8f676d..7f180c9922 100644
--- 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(":");
       result.append(this.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
       result.append(";");
-      result.append("addIndividualsAssociationsForFieldUnits");
-      result.append(":");
-      result.append(this.isAddIndividualsAssociationsForFieldUnits());
-      result.append(";");
       result.append("reuseExistingTaxaWhenPossible");
       result.append(":");
       result.append(this.isReuseExistingTaxaWhenPossible());
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 a7ff3c3e66..7d85f98d00 100644
--- 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");
-- 
2.34.1