Revision e1397e51
Added by Andreas Müller almost 3 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java | ||
|---|---|---|
| 47 | 47 |
import eu.etaxonomy.cdm.exception.FilterException; |
| 48 | 48 |
import eu.etaxonomy.cdm.exception.UnpublishedException; |
| 49 | 49 |
import eu.etaxonomy.cdm.hibernate.HHH_9751_Util; |
| 50 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
| 51 | 50 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 52 | 51 |
import eu.etaxonomy.cdm.model.common.ITreeNode; |
| 53 | 52 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| ... | ... | |
| 156 | 155 |
|
| 157 | 156 |
private void addChildTaxa(TaxonNode originalParentNode, TaxonNode cloneParentNode, Classification classification, TaxonRelationshipType relationshipType){
|
| 158 | 157 |
Reference reference = classification.getReference(); |
| 159 |
Taxon cloneTaxon = (Taxon) HibernateProxyHelper.deproxy(originalParentNode.getTaxon(), Taxon.class).clone();
|
|
| 158 |
Taxon cloneTaxon = CdmBase.deproxy(originalParentNode.getTaxon()).clone();
|
|
| 160 | 159 |
cloneTaxon.setSec(reference); |
| 161 | 160 |
String microReference = null; |
| 162 | 161 |
List<TaxonNode> originalChildNodes = originalParentNode.getChildNodes(); |
| ... | ... | |
| 637 | 636 |
//FIXME NPE for name |
| 638 | 637 |
TaxonName name = tNode.getTaxon().getName(); |
| 639 | 638 |
if(name.getNameCache().equalsIgnoreCase(genus)){
|
| 640 |
TaxonNode clone = (TaxonNode) tNode.clone();
|
|
| 639 |
TaxonNode clone = tNode.clone(); |
|
| 641 | 640 |
if(!tNode.hasChildNodes()){
|
| 642 | 641 |
//FIXME remove classification |
| 643 | 642 |
// parentNode = newClassification.addChildNode(clone, 0, classification.getCitation(), classification.getMicroReference()); |
| ... | ... | |
| 682 | 681 |
continue; //skip to next taxonNode |
| 683 | 682 |
} |
| 684 | 683 |
|
| 685 |
TaxonNode clone = (TaxonNode) tn.clone();
|
|
| 684 |
TaxonNode clone = tn.clone(); |
|
| 686 | 685 |
//FIXME: citation from node |
| 687 | 686 |
//TODO: addchildNode without citation and references |
| 688 | 687 |
// TaxonNode taxonNode = parentNode.addChildNode(clone, classification.getCitation(), classification.getMicroReference()); |
| ... | ... | |
| 719 | 718 |
childNodes = copyFromNode.getChildNodes(); |
| 720 | 719 |
} |
| 721 | 720 |
for(TaxonNode childNode:childNodes){
|
| 722 |
TaxonNode clone = (TaxonNode) childNode.clone();
|
|
| 721 |
TaxonNode clone = childNode.clone(); |
|
| 723 | 722 |
result.addUnChangedObject(clone); |
| 724 | 723 |
if(childNode.hasChildNodes()){
|
| 725 | 724 |
copyAllChildrenToTaxonNode(childNode, clone, result); |
Also available in: Unified diff
cleanup