Project

General

Profile

« Previous | Next » 

Revision c9d0cb80

Added by Katja Luther over 3 years ago

ref #8774: update of termtree editor after creating/removing tree

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/AbstractTermTreeEditor.java
466 466
        return treeList;
467 467
    }
468 468

  
469
    public void putTree(TermTreeDto tree){
470
       trees.put(tree.getUuid(), tree);
471

  
472
    }
473

  
474
    public void removeTree(TermTreeDto tree){
475
        trees.remove(tree.getUuid());
476

  
477
     }
478

  
469 479
    @Override
470 480
    public TermTreeDto getTreeDtoForUuid(UUID treeUuid){
471 481
        return trees.get(treeUuid);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java
38 38
        if (StoreUtil.promptCheckIsDirty(editor)) {
39 39
            return;
40 40
        }
41

  
41
        Object[] expandedElements =  ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements();
42 42
        TermTree newTree = TermTree.NewInstance(editor.getTermType());
43 43
        newTree.setAllowDuplicates(false);
44 44
        newTree.setFlat(false);
......
47 47

  
48 48
        CreateFeatureTreeOperation operation = new CreateFeatureTreeOperation(newTree, editor, editor);
49 49
        TermTreeDto newDto = TermTreeDto.fromTree(newTree);
50

  
50
        editor.setDirty();
51 51
//        AbstractUtility.executeOperation(operation, sync);
52 52
        editor.addOperation(operation);
53
        ((AbstractTermTreeEditor)editor).getTrees().add(newDto);
53
        ((AbstractTermTreeEditor)editor).putTree(newDto);
54 54
        ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
55
        editor.setDirty();
55

  
56
        ((AbstractTermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
57

  
56 58
    }
57 59

  
58 60
    @CanExecute
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureTreeHandler.java
46 46

  
47 47
        for (Object selectedObject : selection.toArray()) {
48 48
        	TermTreeDto featureTree = (TermTreeDto) selectedObject;
49
        	((AbstractTermTreeEditor)editor).getTrees().remove(featureTree);
49
        	((AbstractTermTreeEditor)editor).removeTree(featureTree);
50 50
        	((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
51 51
            RemoveFeatureTreeOperation operation = new RemoveFeatureTreeOperation(featureTree.getUuid(), editor, editor);
52 52
//            AbstractUtility.executeOperation(operation, sync);
53 53
            editor.addOperation(operation);
54 54
            editor.setDirty();
55
            editor.refresh();
55 56
        }
56 57
    }
57 58

  

Also available in: Unified diff