Project

General

Profile

« Previous | Next » 

Revision 6b77cd39

Added by Katja Luther over 4 years ago

ref #8526: remove workaround for hotfix

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
11 11

  
12 12
import java.util.ArrayList;
13 13
import java.util.List;
14
import java.util.UUID;
15 14

  
16 15
import org.eclipse.core.commands.ExecutionException;
17 16
import org.eclipse.core.commands.operations.IUndoContext;
......
19 18
import org.eclipse.core.runtime.IProgressMonitor;
20 19
import org.eclipse.core.runtime.IStatus;
21 20

  
22
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
23 21
import eu.etaxonomy.cdm.api.service.ITaxonService;
24 22
import eu.etaxonomy.cdm.api.service.UpdateResult;
25
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
26 23
import eu.etaxonomy.cdm.model.taxon.Synonym;
27 24
import eu.etaxonomy.cdm.model.taxon.SynonymType;
28 25
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
78 75
		monitor.worked(20);
79 76

  
80 77
		UpdateResult result = CdmStore.getService(ITaxonService.class).swapSynonymAndAcceptedTaxon(synonym.getUuid(), element.getUuid(), setNameInSource);//TODO
81
		//Taxon taxon = (Taxon)result.getCdmEntity();
78
		Taxon taxon = (Taxon)result.getCdmEntity();
82 79
		List<String> propertyPath = new ArrayList<>();
83 80
		propertyPath.add("synonyms");
84
		Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
85
		List<UUID> nodeUuids = new ArrayList<>();
86
		for (TaxonNode node: nodes){
87
		    nodeUuids.add(node.getUuid());
88
        }
89
		//nodes = CdmStore.getService(ITaxonNodeService.class).load(nodeUuids, null);
90
		List<TaxonNode> parents = new ArrayList<>();
91
		for (TaxonNode node: nodes){
92
		    TaxonNode parent = HibernateProxyHelper.deproxy(node.getParent(), TaxonNode.class);
93
		    TaxonNode newTaxonNode = parent.addChildTaxon(taxon, null, null);
94
		    parents.add(parent);
95
		    CdmStore.getService(ITaxonNodeService.class).saveNewTaxonNode(newTaxonNode);
96

  
97
		}
81
//		Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
82

  
98 83

  
99 84
		monitor.worked(40);
100 85

  

Also available in: Unified diff