Revision 892efc69
Added by Andreas Kohlbecker almost 14 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/AbstractCdmBeanProcessor.java | ||
---|---|---|
17 | 17 |
import java.util.Map; |
18 | 18 |
import java.util.Set; |
19 | 19 |
|
20 |
import net.sf.json.JSONArray; |
|
21 | 20 |
import net.sf.json.JSONException; |
22 | 21 |
import net.sf.json.JSONObject; |
23 | 22 |
import net.sf.json.JsonConfig; |
... | ... | |
84 | 83 |
if(logger.isDebugEnabled()){ |
85 | 84 |
logger.debug("processing " + key + " of " + bean.getClass()); |
86 | 85 |
} |
87 |
if(Collection.class.isAssignableFrom(type) || Object.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type)){ |
|
86 |
if(CdmBase.class.isAssignableFrom(type)){ |
|
87 |
json.element(key, value, jsonConfig); |
|
88 |
} else if(Collection.class.isAssignableFrom(type) || Map.class.isAssignableFrom(type)){ |
|
89 |
json.element(key, value, jsonConfig); |
|
90 |
} else if(Object.class.isAssignableFrom(type)){ |
|
88 | 91 |
json.element(key, value, jsonConfig); |
89 | 92 |
} else { |
90 | 93 |
json.element(key, value); |
Also available in: Unified diff
merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk