cleanup

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/coldp/ColDpExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/coldp/ColDpExportConfigurator.java
index 110f3956401d24c44176f37d382573e4628850a7..c08a3fde5b8354c7f86c16ea79d31d4380a6a382 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/coldp/ColDpExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/coldp/ColDpExportConfigurator.java
@@ -41,21 +41,6 @@ public class ColDpExportConfigurator
     //filter
     private boolean doFactualData = true;
 
-    //metadata /gfbio
-    /*
-    private String description;
-    private String creator;
-    private String contributor;
-    private String title;
-    private Language language;
-    private String dataSet_landing_page;
-    private String dataset_download_link;
-    private String base_url;
-    private String recommended_citation;
-    private String location;
-    private String keywords;
-    private String licence;
-*/
     private static final ColDpExportTransformer transformer = new ColDpExportTransformer();
 
 //************************* FACTORY ******************************/

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 0a3cb1b5c85468568a645e04b9fa7e456830a6c1..b23a2992525aaf21cac567adb388b176e6a7ca87 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
@@ -55,33 +55,10 @@ public class Abcd206ImportConfigurator
         return new Abcd206ImportConfigurator(null, uri, destination, false);
     }
 
-    /**
-     * @param uri
-     * @param object
-     * @param b
-     * @return
-     */
     public static Abcd206ImportConfigurator NewInstance(URI uri, ICdmDataSource destination, boolean interact) {
         return new Abcd206ImportConfigurator(null, uri, destination, interact);
     }
 
-    /**
-     * @param uri
-     * @param object
-     * @param b
-     * @return
-     *//*
-    public static Abcd206ImportConfigurator NewInstance(InputStream stream, ICdmDataSource destination, boolean interact) {
-        return new Abcd206ImportConfigurator(stream, null, destination, interact);
-    }
-*/
-
-
-    /**
-     * @param berlinModelSource
-     * @param sourceReference
-     * @param destination
-     */
     private Abcd206ImportConfigurator(InputStream stream, URI uri, ICdmDataSource destination, boolean interact) {
         super(defaultTransformer);
         if (stream != null){
@@ -94,16 +71,11 @@ public class Abcd206ImportConfigurator
         setInteractWithUser(interact);
     }
 
-
-
-
-
     @Override
     public Abcd206ImportState getNewState() {
         return new Abcd206ImportState(this);
     }
 
-
     @Override
     public InputStream getSource(){
         if (super.getSource() != null){
@@ -121,8 +93,6 @@ public class Abcd206ImportConfigurator
         }
     }
 
-
-
     public URI getSourceUri(){
        return this.sourceUri;
     }
@@ -132,9 +102,6 @@ public class Abcd206ImportConfigurator
         super.setSource(null);
     }
 
-
-
-
     public URI getDnaSoure() {
         return dnaSoure;
     }
@@ -149,130 +116,109 @@ public class Abcd206ImportConfigurator
         return sourceReference;
     }
 
-    /**
-     * @return the getSiblings
-     */
     public boolean isGetSiblings() {
         return getSiblings;
     }
 
-    /**
-     * @param getSiblings the getSiblings to set
-     */
     public void setGetSiblings(boolean getSiblings) {
         this.getSiblings = getSiblings;
     }
 
 
-
-
-@Override
-public String toString(){
-
-    StringBuffer result = new StringBuffer();
-    //the preference value is build like this:
-      //<section1>:true;<section2>:false....
-
-      result.append("ignoreImportOfExistingSpecimen");
-      result.append(":");
-      result.append(this.isIgnoreImportOfExistingSpecimen());
-      result.append(";");
-      result.append("addIndividualsAssociationsSuchAsSpecimenAndObservations");
-      result.append(":");
-      result.append(this.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
-      result.append(";");
-      result.append("reuseExistingTaxaWhenPossible");
-      result.append(":");
-      result.append(this.isReuseExistingTaxaWhenPossible());
-      result.append(";");
-      result.append("ignoreAuthorship");
-      result.append(":");
-      result.append(this.isIgnoreAuthorship());
-      result.append(";");
-      result.append("addMediaAsMediaSpecimen");
-      result.append(":");
-      result.append(this.isAddMediaAsMediaSpecimen());
-      result.append(";");
-      result.append("reuseExistingMetaData");
-      result.append(":");
-      result.append(this.isReuseExistingMetaData());
-      result.append(";");
-      result.append("reuseExistingDescriptiveGroups");
-      result.append(":");
-      result.append(this.isReuseExistingDescriptiveGroups());
-      result.append(";");
-      result.append("allowReuseOtherClassifications");
-      result.append(":");
-      result.append(this.isAllowReuseOtherClassifications());
-      result.append(";");
-      result.append("deduplicateReferences");
-      result.append(":");
-      result.append(this.isDeduplicateReferences());
-      result.append(";");
-      result.append("deduplicateClassifications");
-      result.append(":");
-      result.append(this.isDeduplicateClassifications());
-      result.append(";");
-      result.append("moveNewTaxaToDefaultClassification");
-      result.append(":");
-      result.append(this.isMoveNewTaxaToDefaultClassification());
-      result.append(";");
-      result.append("getSiblings");
-      result.append(":");
-      result.append(this.isGetSiblings());
-      result.append(";");
-      result.append("removeCountryFromLocalityText");
-      result.append(":");
-      result.append(this.isRemoveCountryFromLocalityText());
-      result.append(";");
-
-      result.append("mapUnitIdToCatalogNumber");
-      result.append(":");
-      result.append(this.isMapUnitIdToCatalogNumber());
-      result.append(";");
-      result.append("mapUnitIdToAccessionNumber");
-      result.append(":");
-      result.append(this.isMapUnitIdToAccessionNumber());
-      result.append(";");
-      result.append("mapUnitIdToBarcode");
-      result.append(":");
-      result.append(this.isMapUnitIdToBarcode());
-      result.append(";");
-
-      result.append("overwriteExistingSpecimens");
-      result.append(":");
-      result.append(this.isOverwriteExistingSpecimens());
-      result.append(";");
-      result.append("nomenclaturalCode");
-      result.append(":");
-      result.append(this.getNomenclaturalCode() != null ? this.getNomenclaturalCode().getKey():"");
-      result.append(";");
-      result.append("dnaSource");
-      result.append(":");
-      result.append(this.getDnaSoure() != null ? this.getDnaSoure().toString():"");
-      result.append(";");
-      result.append("classificationUUID");
-      result.append(":");
-      result.append(this.getClassificationUuid() != null ? this.getClassificationUuid().toString():"");
-      result.append(";");
-      result.append("classificationName");
-      result.append(":");
-      result.append(this.getClassificationName() != null ? this.getClassificationName():"");
-      result.append(";");
-
-
-    return result.toString();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-}
+    @Override
+    public String toString(){
+
+        StringBuffer result = new StringBuffer();
+        //the preference value is build like this:
+        //<section1>:true;<section2>:false....
+
+        result.append("ignoreImportOfExistingSpecimen");
+        result.append(":");
+        result.append(this.isIgnoreImportOfExistingSpecimen());
+        result.append(";");
+        result.append("addIndividualsAssociationsSuchAsSpecimenAndObservations");
+        result.append(":");
+        result.append(this.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
+        result.append(";");
+        result.append("reuseExistingTaxaWhenPossible");
+        result.append(":");
+        result.append(this.isReuseExistingTaxaWhenPossible());
+        result.append(";");
+        result.append("ignoreAuthorship");
+        result.append(":");
+        result.append(this.isIgnoreAuthorship());
+        result.append(";");
+        result.append("addMediaAsMediaSpecimen");
+        result.append(":");
+        result.append(this.isAddMediaAsMediaSpecimen());
+        result.append(";");
+        result.append("reuseExistingMetaData");
+        result.append(":");
+        result.append(this.isReuseExistingMetaData());
+        result.append(";");
+        result.append("reuseExistingDescriptiveGroups");
+        result.append(":");
+        result.append(this.isReuseExistingDescriptiveGroups());
+        result.append(";");
+        result.append("allowReuseOtherClassifications");
+        result.append(":");
+        result.append(this.isAllowReuseOtherClassifications());
+        result.append(";");
+        result.append("deduplicateReferences");
+        result.append(":");
+        result.append(this.isDeduplicateReferences());
+        result.append(";");
+        result.append("deduplicateClassifications");
+        result.append(":");
+        result.append(this.isDeduplicateClassifications());
+        result.append(";");
+        result.append("moveNewTaxaToDefaultClassification");
+        result.append(":");
+        result.append(this.isMoveNewTaxaToDefaultClassification());
+        result.append(";");
+        result.append("getSiblings");
+        result.append(":");
+        result.append(this.isGetSiblings());
+        result.append(";");
+        result.append("removeCountryFromLocalityText");
+        result.append(":");
+        result.append(this.isRemoveCountryFromLocalityText());
+        result.append(";");
+
+        result.append("mapUnitIdToCatalogNumber");
+        result.append(":");
+        result.append(this.isMapUnitIdToCatalogNumber());
+        result.append(";");
+        result.append("mapUnitIdToAccessionNumber");
+        result.append(":");
+        result.append(this.isMapUnitIdToAccessionNumber());
+        result.append(";");
+        result.append("mapUnitIdToBarcode");
+        result.append(":");
+        result.append(this.isMapUnitIdToBarcode());
+        result.append(";");
+
+        result.append("overwriteExistingSpecimens");
+        result.append(":");
+        result.append(this.isOverwriteExistingSpecimens());
+        result.append(";");
+        result.append("nomenclaturalCode");
+        result.append(":");
+        result.append(this.getNomenclaturalCode() != null ? this.getNomenclaturalCode().getKey():"");
+        result.append(";");
+        result.append("dnaSource");
+        result.append(":");
+        result.append(this.getDnaSoure() != null ? this.getDnaSoure().toString():"");
+        result.append(";");
+        result.append("classificationUUID");
+        result.append(":");
+        result.append(this.getClassificationUuid() != null ? this.getClassificationUuid().toString():"");
+        result.append(";");
+        result.append("classificationName");
+        result.append(":");
+        result.append(this.getClassificationName() != null ? this.getClassificationName():"");
+        result.append(";");
+
+        return result.toString();
+    }
+}
\ No newline at end of file

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 247a9c2f8d584b1344fdec5ad89dcd4b8a9cb6ec..e3a9f369a2410a2dd61002605c33d3e733bfd9ab 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
@@ -48,7 +48,8 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
  * @since 15.07.2016
  */
 @Component
-public class GbifImport extends SpecimenImportBase<GbifImportConfigurator, SpecimenImportStateBase<SpecimenImportConfiguratorBase, SpecimenImportStateBase>> {
+public class GbifImport
+        extends SpecimenImportBase<GbifImportConfigurator, SpecimenImportStateBase<SpecimenImportConfiguratorBase, SpecimenImportStateBase>> {
 
     private static final long serialVersionUID = 3631757505818095911L;
     private static final Logger logger = LogManager.getLogger();

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImportConfigurator.java
index 1570f74dc1312cad31f545cb968284a4248131cf..7981b8cd82d97184d21a3ed55238d4b167cb6544 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/gbif/in/GbifImportConfigurator.java
@@ -17,7 +17,6 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 /**
  * @author k.luther
  * @since 15.07.2016
- *
  */
 public class GbifImportConfigurator<GbifImportState, InputStream> extends SpecimenImportConfiguratorBase {
 
@@ -37,39 +36,25 @@ public class GbifImportConfigurator<GbifImportState, InputStream> extends Specim
         return newInstance;
     }
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.io.common.ImportConfiguratorBase#makeIoClassList()
-     */
     @Override
     protected void makeIoClassList() {
         System.out.println("makeIOClassList");
         ioClassList = new Class[]{
                GbifImport.class,
         };
-
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.io.common.ImportConfiguratorBase#getSourceReference()
-     */
     @Override
     public Reference getSourceReference() {
         // TODO Auto-generated method stub
         return null;
     }
 
-
-
     @Override
     public SpecimenImportStateBase getNewState() {
         SpecimenImportStateBase state = new SpecimenImportStateBase(this);
-
         return state;
     }
 

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonRelationsImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonRelationsImport.java
index 0e61be9146c7490f883a3900ac0ae1d1f258a771..dca31f805c7906a8335ea662ad6bf510d9b62c89 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonRelationsImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonRelationsImport.java
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.cdm.io.tcsrdf;
 
 import java.util.HashSet;
@@ -33,13 +32,15 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 
-
 /**
  * @author a.mueller
  * @since 29.05.2008
  */
 @Component
-public class TcsRdfTaxonRelationsImport extends TcsRdfImportBase implements ICdmIO<TcsRdfImportState> {
+public class TcsRdfTaxonRelationsImport
+        extends TcsRdfImportBase
+        implements ICdmIO<TcsRdfImportState> {
+
     private static final long serialVersionUID = 7473543276142564219L;
 
     private static final Logger logger = LogManager.getLogger();