revert methodCall renaming

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaRefImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaRefImport.java
index 61d6ff4e0f6cf1faad6ef2732047300f065921b5..f3426261345b52f93c25ec454be927eadb1b0e5d 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaRefImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaRefImport.java
@@ -56,9 +56,6 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
        /* Interval for progress info message when retrieving taxa */\r
        private int modCount = 10000;\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
-        */\r
        @Override\r
        protected boolean doCheck(FaunaEuropaeaImportState state) {\r
                boolean result = true;\r
@@ -82,9 +79,6 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
 //             }\r
        }\r
        \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doInvoke(eu.etaxonomy.cdm.io.common.IImportConfigurator, eu.etaxonomy.cdm.api.application.CdmApplicationController, java.util.Map)\r
-        */\r
        @Override\r
        protected void doInvoke(FaunaEuropaeaImportState state) {                               \r
                /*\r
@@ -208,7 +202,7 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
                        \r
                                if ((i++ % limit) == 0) {\r
 \r
-                                       txStatus = startTransactionForImports();\r
+                                       txStatus = startTransaction();\r
                                        references = new HashMap<Integer,Reference>(limit);\r
                                        authors = new HashMap<String,TeamOrPersonBase>(limit);\r
                                        \r
@@ -281,7 +275,6 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
                        \r
                        \r
                }\r
-               rsRefs = null;\r
                if (references != null){\r
                        commitReferences(references, authors, referenceUuids, i, txStatus);\r
                        references= null;\r
@@ -291,8 +284,6 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
                        logger.error("SQLException:" +  e);\r
                        state.setUnsuccessfull();\r
                }\r
-               references = null;\r
-               authors = null;\r
                \r
        }\r
 \r
@@ -423,39 +414,39 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
                                \r
                        \r
                \r
-                       if (((i % limit) == 0 && i > 1 ) || i == count) { \r
-\r
-                               try {\r
-\r
-                                       Set<UUID> uuidSet;\r
-                                       commitTaxaReferenceRel(taxonUuids, fauEuTaxonMap,\r
-                                                       referenceUuids, referenceIDs, limit, txStatus, i,\r
-                                                       taxon);\r
-\r
-                                       taxonUuids = null;\r
-                                       references = null;\r
-                                       taxonList = null;\r
-                                       fauEuTaxonMap = null;\r
-                                       referenceIDs = null;\r
-                                       referenceList = null;\r
-                                       uuidSet = null;\r
-                                       \r
-\r
-                               } catch (Exception e) {\r
-                                       logger.warn("An exception occurred when creating reference, reference could not be saved.");\r
+                               if (((i % limit) == 0 && i > 1 ) || i == count) { \r
+       \r
+                                       try {\r
+       \r
+                                               Set<UUID> uuidSet;\r
+                                               commitTaxaReferenceRel(taxonUuids, fauEuTaxonMap,\r
+                                                               referenceUuids, referenceIDs, limit, txStatus, i,\r
+                                                               taxon);\r
+       \r
+                                               taxonUuids = null;\r
+                                               references = null;\r
+                                               taxonList = null;\r
+                                               fauEuTaxonMap = null;\r
+                                               referenceIDs = null;\r
+                                               referenceList = null;\r
+                                               uuidSet = null;\r
+                                               \r
+       \r
+                                       } catch (Exception e) {\r
+                                               logger.warn("An exception occurred when creating reference, reference could not be saved.");\r
+                                       }\r
                                }\r
                        }\r
+                       if (taxonUuids != null){\r
+                               commitTaxaReferenceRel(taxonUuids, fauEuTaxonMap,\r
+                                               referenceUuids, referenceIDs, limit, txStatus, i,\r
+                                               taxon);\r
+                       }\r
+                       rsTaxRefs.close();\r
+               } catch (SQLException e) {\r
+                               logger.error("SQLException:" +  e);\r
+                               state.setUnsuccessfull();\r
                }\r
-               if (taxonUuids != null){\r
-                       commitTaxaReferenceRel(taxonUuids, fauEuTaxonMap,\r
-                                       referenceUuids, referenceIDs, limit, txStatus, i,\r
-                                       taxon);\r
-               }\r
-               rsTaxRefs.close();\r
-} catch (SQLException e) {\r
-               logger.error("SQLException:" +  e);\r
-               state.setUnsuccessfull();\r
-}\r
                taxonUuids = null;\r
                references = null;\r
                taxonList = null;\r
@@ -556,14 +547,7 @@ public class FaunaEuropaeaRefImport extends FaunaEuropaeaImportBase {
                \r
        }\r
 \r
-       \r
-       \r
-\r
-       \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
-        */\r
+       @Override\r
        protected boolean isIgnore(FaunaEuropaeaImportState state){\r
                return (state.getConfig().getDoReferences() == IImportConfigurator.DO_REFERENCES.NONE);\r
        }\r