Revision 9dc896c9
Added by Andreas Müller almost 7 years ago
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
import java.util.Set; |
12 | 12 |
|
13 |
import net.sf.json.processors.JsonBeanProcessorMatcher; |
|
14 |
|
|
15 | 13 |
import org.apache.log4j.Logger; |
16 | 14 |
import org.hibernate.proxy.HibernateProxy; |
17 | 15 |
|
... | ... | |
19 | 17 |
import eu.etaxonomy.cdm.model.common.TermBase; |
20 | 18 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
21 | 19 |
import eu.etaxonomy.cdm.model.media.Media; |
22 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
20 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
23 | 21 |
import eu.etaxonomy.cdm.model.name.TypeDesignationBase; |
24 | 22 |
import eu.etaxonomy.cdm.model.reference.Reference; |
25 | 23 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
24 |
import net.sf.json.processors.JsonBeanProcessorMatcher; |
|
26 | 25 |
|
27 | 26 |
/** |
28 | 27 |
* can handle HibernateProxys |
... | ... | |
54 | 53 |
if (TaxonBase.class.isAssignableFrom(target)) { |
55 | 54 |
return DEFAULT.getMatch(TaxonBase.class, set); |
56 | 55 |
} |
57 |
if (TaxonNameBase.class.isAssignableFrom(target)) {
|
|
58 |
return DEFAULT.getMatch(TaxonNameBase.class, set);
|
|
56 |
if (TaxonName.class.isAssignableFrom(target)) { |
|
57 |
return DEFAULT.getMatch(TaxonName.class, set); |
|
59 | 58 |
} |
60 | 59 |
if (TermBase.class.isAssignableFrom(target)) { |
61 | 60 |
return DEFAULT.getMatch(TermBase.class, set); |
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase