fixing CDM part of #386 (Handle hybrids in data portals)

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / json / processor / bean / TaxonNameBaseBeanProcessor.java

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
index a9f5fe920a76b17800acd249eaeafd11e843d7e6..c33651820585657a1b1975705a310ba784d43f15 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java
@@ -1,9 +1,9 @@
 // $Id: TaxonBaseBeanProcessor.java 5473 2009-03-25 13:42:07Z a.kohlbecker $\r
 /**\r
  * Copyright (C) 2009 EDIT\r
- * European Distributed Institute of Taxonomy \r
+ * European Distributed Institute of Taxonomy\r
  * http://www.e-taxonomy.eu\r
- * \r
+ *\r
  * The contents of this file are subject to the Mozilla Public License Version 1.1\r
  * See LICENSE.TXT at the top of this package for the full license terms.\r
  */\r
@@ -27,38 +27,39 @@ import eu.etaxonomy.cdm.strategy.TaggedTextGenerator;
  */\r
 public class TaxonNameBaseBeanProcessor extends AbstractCdmBeanProcessor<TaxonNameBase> {\r
 \r
-       public static final Logger logger = Logger.getLogger(TaxonNameBaseBeanProcessor.class);\r
+    public static final Logger logger = Logger.getLogger(TaxonNameBaseBeanProcessor.class);\r
+\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()\r
+     */\r
+    @Override\r
+    public List<String> getIgnorePropNames() {\r
+        return Arrays.asList(new String[]{\r
+                // ignore nameRelations to avoid LazyLoadingExceptions coming\r
+                // from NameRelationshipBeanProcessor.secondStep() in which\r
+                // the transient field fromName is added to the serialization\r
+                "relationsFromThisName",\r
+                "relationsToThisName",\r
+                "combinationAuthorTeam",\r
+                "basionymAuthorTeam",\r
+                "exCombinationAuthorTeam",\r
+                "exBasionymAuthorTeam"\r
+        });\r
+    }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()\r
-        */\r
-       @Override\r
-       public List<String> getIgnorePropNames() {\r
-               return Arrays.asList(new String[]{\r
-                               // ignore nameRelations to avoid LazyLoadingExceptions coming \r
-                               // from NameRelationshipBeanProcessor.secondStep() in which \r
-                               // the transient field fromName is added to the serialization\r
-                               "relationsFromThisName",\r
-                               "relationsToThisName",\r
-                               "combinationAuthorTeam",\r
-                               "basionymAuthorTeam",\r
-                               "exCombinationAuthorTeam",\r
-                               "exBasionymAuthorTeam"\r
-               });\r
-       }\r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStage(java.lang.Object, net.sf.json.JSONObject, net.sf.json.JsonConfig)\r
+     */\r
+    @Override\r
+    public JSONObject processBeanSecondStep(TaxonNameBase bean, JSONObject json, JsonConfig jsonConfig) {\r
+        if(logger.isDebugEnabled()){\r
+            logger.debug("processing second step" + bean);\r
+        }\r
+//             json.element("taggedName", TaggedTextGenerator.getTaggedName(bean), jsonConfig);\r
+        json.element("taggedName", bean.getTaggedName(), jsonConfig);\r
+        return json;\r
+    }\r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStage(java.lang.Object, net.sf.json.JSONObject, net.sf.json.JsonConfig)\r
-        */\r
-       @Override\r
-       public JSONObject processBeanSecondStep(TaxonNameBase bean, JSONObject json, JsonConfig jsonConfig) {\r
-               if(logger.isDebugEnabled()){\r
-                       logger.debug("processing second step" + bean);\r
-               }\r
-               json.element("taggedName", TaggedTextGenerator.getTaggedName(bean), jsonConfig);\r
-               return json;\r
-       }\r
 \r
-       \r
 \r
 }\r