cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
index 75c43974b122a5b815f2eb469c1e83ad36bf2257..8e12e73fa36b6bb6be0e2450bb74f97df7ebff96 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/mexico/MexicoEfloraActivator.java
@@ -46,7 +46,6 @@ public class MexicoEfloraActivator {
     private static final String featureTreeName = "Catalogo feature tree";
     private static final String flatFeatureTreeName = "Catalogo flat feature tree";
 
-
     //classification
     static final UUID classificationUuid = UUID.fromString("588dd2de-7c95-42ad-8eb1-994460561b5e");
     private static final String classificationName = "Mexico Eflora";

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
index 452a7668ef49fadbfd7a16e09fcb599fc06ac0b7..5fdd714adcf8dfdb5182e08714ef44364db9dc77 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioDistributionImport.java
@@ -197,13 +197,12 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void createStateAreasVoc(SimpleExcelTaxonImportState<CONFIG> state) {
         //voc
         URI termSourceUri = null;
         String label = "Mexican States";
         String description = "Mexican States as used by the CONABIO Rubiaceae database";
-        stateAreasVoc = OrderedTermVocabulary.NewInstance(TermType.NamedArea,
+        stateAreasVoc = OrderedTermVocabulary.NewOrderedInstance(TermType.NamedArea, NamedArea.class,
                 description, label, null, termSourceUri);
         stateAreasVoc.setUuid(MexicoConabioTransformer.uuidMexicanStatesVoc);
         Representation rep = Representation.NewInstance("Estados Méxicanos", "Estados Méxicanos", null, Language.SPANISH_CASTILIAN());
@@ -272,12 +271,6 @@ public class MexicoConabioDistributionImport<CONFIG extends MexicoConabioImportC
         addArea(state, areaLabel, uuid, mappingLabel, null);  //short cut if label and mapping label are equal
     }
 
-
-    /**
-     * @param state
-     * @param string
-     * @param uuidaguascalientes
-     */
     private void addArea(SimpleExcelTaxonImportState<CONFIG> state, String areaLabel, UUID uuid, String mappingLabel, Integer id1) {
         String abbrev = null;
         NamedArea newArea = NamedArea.NewInstance(

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
index a158ee133aadcbfce5adfeafcd4b532f04754426..747532a25d7c7b623881bb3d114204abd52fb652 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactCategoryImport.java
@@ -137,6 +137,7 @@ public class MexicoEfloraFactCategoryImport extends MexicoEfloraImportBase {
 
     private void saveNodeRecursive(MexicoEfloraImportState state, TreeNode node, TermVocabulary<Feature> featureVoc, Feature parentFeature,
             TermNode<Feature> parentFeatureTreeNode, TermNode<Feature> flatFeatureTreereTreeNode) {
+
         if (!node.children.isEmpty()) {
             //is feature
             String sep = UTF8.EN_DASH_SPATIUM.toString();

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java
index 94382bd8f6d3aafb0a4f1fb7705e853d21c3f7fb..8b407ae9a5339dcbfd76b7adde950594fba9ff91 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportBase.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.mexico;
 
 import java.sql.ResultSet;
@@ -126,4 +125,4 @@ public abstract class MexicoEfloraImportBase
         }
         return false;
     }
-}
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
index 0e42fdd232f5fb15757c2a1997da48aa0795aed4..9c14e5e359944bec8b0fdf528df70af70789e681 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportConfigurator.java
@@ -77,7 +77,6 @@ public class MexicoEfloraImportConfigurator
                        MexicoEfloraFactCategoryImport.class,
                        MexicoEfloraFactImport.class,
                        MexicoEfloraTaxonRelationImport.class,
-
                };
        }
 

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
index c8978afb5b38fc76926bf33ddbaab361a1bb71e9..e6ca0e85a30d0ec82d539cfb0e9d17c0f7c95686 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java
@@ -89,4 +89,6 @@ public class MexicoEfloraImportState
         return distributionMap;
     }
 
+
+
 }

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
index 7e9727d0aa1ceaf44b2ff5d7f1750a1605aeeeda..3a575f36288330ca835a141ca35cf58eef845c64 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraTaxonImport.java
@@ -42,7 +42,6 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 public class MexicoEfloraTaxonImport  extends MexicoEfloraImportBase {
 
     private static final long serialVersionUID = -1186364983750790695L;
-
     private static final Logger logger = Logger.getLogger(MexicoEfloraTaxonImport.class);
 
        public static final String NAMESPACE = "Taxon";