fix WebMarker import for BerlinModel

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
index 3f57537d46c39aee465ddb87a62b10c040d545a9..c9344c55052ad60924fb5b1c0879d7fdb9654b04 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
@@ -49,10 +49,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
                super(dbTableName, pluralString);\r
        }\r
        \r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getIdQuery()\r
-        */\r
        @Override\r
        protected String getIdQuery(BerlinModelImportState state) {\r
                String result = " SELECT markerId FROM " + getTableName();\r
@@ -62,9 +58,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
                return result;\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)\r
-        */\r
        @Override\r
        protected String getRecordQuery(BerlinModelImportConfigurator config) {\r
                String strQuery = \r
@@ -72,16 +65,13 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
             " FROM webMarker INNER JOIN webTableName ON webMarker.TableNameFk = webTableName.TableNameId " +\r
             " WHERE (markerId IN ("+ ID_LIST_TOKEN + ") )";\r
                return strQuery;\r
-\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#doPartition(eu.etaxonomy.cdm.io.berlinModel.in.ResultSetPartitioner, eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)\r
-        */\r
+       @Override\r
        public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {\r
                boolean success = true ;\r
        \r
-               MapWrapper<Taxon> taxonMap = (MapWrapper<Taxon>)state.getStore(ICdmIO.TAXON_STORE);\r
+               Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);\r
                Set<TaxonBase> taxaToBeSaved = new HashSet<TaxonBase>(); \r
                \r
                Map<String, DefinedTermBase> definedTermMap = state.getDbCdmDefinedTermMap();\r
@@ -132,13 +122,10 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
                return success;\r
        }\r
                \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)\r
-        */\r
+       @Override\r
        public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {\r
                String nameSpace;\r
-               Class cdmClass;\r
+               Class<?> cdmClass;\r
                Set<String> idSet;\r
                Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();\r
                \r
@@ -151,7 +138,7 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
                                        logger.warn("A marker is not related to table PTaxon. This case is not handled yet!");\r
                                }else{\r
                                        handleForeignKey(rs, taxonIdSet, "RIdentifierFk");\r
-       }\r
+                               }\r
                        }\r
        \r
                        //taxon map\r
@@ -167,7 +154,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
                return result;\r
        }\r
 \r
-       \r
        private boolean addMarker(AnnotatableEntity annotatableEntity, boolean activeFlag, int markerCategoryFk, Map<String, DefinedTermBase> map ){\r
                MarkerType markerType = (MarkerType)map.get("webMarkerCategory_" + markerCategoryFk);\r
                if (markerType == null){\r
@@ -179,23 +165,14 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 \r
        }\r
        \r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)\r
-        */\r
        @Override\r
        protected boolean doCheck(BerlinModelImportState state){\r
                IOValidator<BerlinModelImportState> validator = new BerlinModelWebMarkerImportValidator();\r
                return validator.validate(state);\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(BerlinModelImportState state){\r
                return ! state.getConfig().isDoMarker();\r
        }\r
-\r
-\r
 }\r