minor

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / jaxb / JaxbExport.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
index 66f7d0476bb3eeb2379baae559116a62ab92e092..b6c87d605bada082e068afa5db6f588309d0dd17 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
@@ -27,10 +27,13 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.User;\r
+import eu.etaxonomy.cdm.model.description.FeatureNode;\r
+import eu.etaxonomy.cdm.model.description.FeatureTree;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
 \r
 /**\r
@@ -128,6 +131,7 @@ public class JaxbExport extends CdmExportBase<JaxbExportConfigurator, JaxbExport
                int referenceBaseRows = numberOfRows;\r
                int taxonNameBaseRows = numberOfRows;\r
                int taxonBaseRows = numberOfRows;\r
+               int taxonNodeRows = numberOfRows;\r
                int relationshipRows = numberOfRows;\r
                int occurrencesRows = numberOfRows;\r
                int mediaRows = numberOfRows;\r
@@ -258,18 +262,38 @@ public class JaxbExport extends CdmExportBase<JaxbExportConfigurator, JaxbExport
                if (jaxbExpConfig.isDoFeatureData() == true) {\r
                        if (featureDataRows == 0) { featureDataRows = MAX_ROWS; }\r
                        logger.info("# Feature Tree, Feature Node");\r
+                       List<FeatureTree> featureTrees = new ArrayList<FeatureTree>();\r
+                       featureTrees= getFeatureTreeService().list(null,featureDataRows, 0, null, null);\r
+                       List<FeatureTree> taxTreesdeproxy = new ArrayList<FeatureTree>();\r
+                       for (FeatureTree featureTree : featureTrees){\r
+                               HibernateProxyHelper.deproxy(featureTree);\r
+                               taxTreesdeproxy.add(featureTree);\r
+                       }\r
+                       \r
                        dataSet.setFeatureTrees(getFeatureTreeService().list(null,null,null,null,null));\r
                }\r
                if (jaxbExpConfig.isDoTaxonomicTreeData() == true) {\r
                        if (taxonomicTreeDataRows == 0) { taxonomicTreeDataRows = MAX_ROWS; }\r
                        logger.info("# Taxonomic Tree");\r
+                       \r
+                       \r
                        List<TaxonomicTree> taxTrees = new ArrayList<TaxonomicTree>();\r
                        taxTrees= getTaxonTreeService().list(null,taxonomicTreeDataRows, 0, null, null);\r
+                       \r
                        List<TaxonomicTree> taxTreesdeproxy = new ArrayList<TaxonomicTree>();\r
                        for (TaxonomicTree taxTree : taxTrees){\r
                                HibernateProxyHelper.deproxy(taxTree);\r
                                taxTreesdeproxy.add(taxTree);\r
                        }\r
+                       List<TaxonNode> taxNodes = new ArrayList<TaxonNode>();\r
+                       taxNodes= getTaxonTreeService().getAllNodes();\r
+                       List<TaxonNode> taxNodesdeproxy = new ArrayList<TaxonNode>();\r
+                       for (TaxonNode taxNode : taxNodes){\r
+                               HibernateProxyHelper.deproxy(taxNode);\r
+                               taxNodesdeproxy.add(taxNode);\r
+                       }\r
+                       \r
+                       dataSet.setTaxonNodes(taxNodesdeproxy);\r
                        dataSet.setTaxonomicTrees(taxTreesdeproxy );\r
                }\r
                //TODO: FIXME!!!!!\r