Project

General

Profile

« Previous | Next » 

Revision 78c76c38

Added by Patrick Plitzner over 4 years ago

ref #8238 Remove too specific generics from TermTree and TermNode

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
48 48
import eu.etaxonomy.cdm.api.service.ITermService;
49 49
import eu.etaxonomy.cdm.api.service.ITermTreeService;
50 50
import eu.etaxonomy.cdm.model.description.Character;
51
import eu.etaxonomy.cdm.model.description.Feature;
52 51
import eu.etaxonomy.cdm.model.term.TermNode;
53 52
import eu.etaxonomy.cdm.model.term.TermTree;
54 53
import eu.etaxonomy.cdm.model.term.TermType;
......
151 150

  
152 151
        ISelection clipBoardSelection = LocalSelectionTransfer.getTransfer().getSelection();
153 152
        Object firstElement = selection.getFirstElement();
154
        TermNode<Feature> parentNode = null;
153
        TermNode parentNode = null;
155 154
        if(firstElement instanceof TermNode){
156
            parentNode = (TermNode<Feature>) firstElement;
155
            parentNode = (TermNode) firstElement;
157 156
        }
158 157
        else if(firstElement instanceof TermTree){
159
            parentNode = ((TermTree<Feature>)firstElement).getRoot();
158
            parentNode = ((TermTree)firstElement).getRoot();
160 159
        }
161 160
        if(parentNode!=null){
162
        	TermNode<Feature> copiedNode = (TermNode<Feature>) ((IStructuredSelection)clipBoardSelection).getFirstElement();
161
        	TermNode copiedNode = (TermNode) ((IStructuredSelection)clipBoardSelection).getFirstElement();
163 162

  
164 163
            AddFeatureOperation operation = new AddFeatureOperation(copiedNode.getTerm().getUuid(), parentNode, this, this);
165 164
            AbstractUtility.executeOperation(operation, sync);
......
249 248
        // commit the conversation and start a new transaction immediately
250 249
        conversation.commit(true);
251 250

  
252
        CdmStore.getService(ITermTreeService.class).saveOrUpdate((List)getRootEntities());
251
        CdmStore.getService(ITermTreeService.class).saveOrUpdate(getRootEntities());
253 252

  
254
        List<TermTree<Feature>> rootEntities = getRootEntities();
253
        List<TermTree> rootEntities = getRootEntities();
255 254
        for (TermTree featureTree : rootEntities) {
256 255
            if(featureTree.getTermType().equals(TermType.Character)){
257 256
                TermTree<Character> characterTree = featureTree;
......
298 297
    }
299 298

  
300 299
    @Override
301
    public List<TermTree<Feature>> getRootEntities() {
302
        return (List<TermTree<Feature>>) viewer.getInput();
300
    public List<TermTree> getRootEntities() {
301
        return (List<TermTree>) viewer.getInput();
303 302
    }
304 303

  
305 304
    @Override
......
349 348
        initializeTrees();
350 349
        viewer.refresh();
351 350
        if(objectAffectedByOperation instanceof TermNode){
352
        	TermNode<Feature> node = (TermNode)objectAffectedByOperation;
351
        	TermNode node = (TermNode)objectAffectedByOperation;
353 352
            viewer.expandToLevel(node.getGraph(), 1);
354 353
        }
355 354
        if(objectAffectedByOperation!=null){

Also available in: Unified diff