Project

General

Profile

« Previous | Next » 

Revision 21015b47

Added by Katja Luther over 3 years ago

ref #8774: fix AOOB Exception in termtree editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
649 649
        return false;
650 650
    }
651 651

  
652
    @Override
653
    public void setNodeDtoForUuid(TermNodeDto node) {
654
        // TODO Auto-generated method stub
655

  
656
    }
657

  
658
    @Override
659
    public void setTreeDtoForUuid(TermTreeDto tree) {
660
        // TODO Auto-generated method stub
661

  
662
    }
663

  
652 664

  
653 665

  
654 666

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/AbstractTermTreeEditor.java
481 481
        return trees.get(treeUuid);
482 482
    }
483 483

  
484
    @Override
485
    public void setTreeDtoForUuid(TermTreeDto tree){
486
        trees.put(tree.getUuid(), tree);
487
    }
488

  
489
    @Override
490
    public void setNodeDtoForUuid(TermNodeDto node){
491
        this.uuidTermMap.put(node.getUuid(), node);
492
    }
493

  
484 494
    @Override
485 495
    public void addOperation(AbstractPostOperation operation) {
486 496
        operationList.add(operation);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/CharacterTreeEditor.java
25 25
        return TermType.Character;
26 26
    }
27 27

  
28

  
29

  
28 30
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoDropAdapter.java
137 137
		                return false;
138 138
		            }
139 139
		        }
140
		    	TermNodeDto droppedNode = (TermNodeDto) droppedObject;
140
		    	TermNodeDto droppedNode = editor.getNodeDtoForUuid(((TermNodeDto) droppedObject).getUuid());
141 141
		        TermNodeDto oldParent = editor.getNodeDtoForUuid(droppedNode.getParentUuid());
142 142
		        int currentPosition = oldParent.getIndex(droppedNode);
143 143

  
......
149 149
		        Object o = oldParent.getChildren().remove(currentPosition);
150 150
		        target.getChildren().add(position, droppedNode);
151 151
		        droppedNode.setParentUuid(target.getUuid());
152
		        editor.setNodeDtoForUuid(droppedNode);
153
		        editor.setNodeDtoForUuid(target);
154
		        editor.setNodeDtoForUuid(oldParent);
152 155
		        editor.setDirty();
153 156
		        editor.addOperation(operation);
154 157
		    }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/IFeatureTreeEditor.java
33 33

  
34 34
    public TermNodeDto getNodeDtoForUuid(UUID nodeUuid);
35 35
    public TermTreeDto getTreeDtoForUuid(UUID treeUuid);
36
    public void setNodeDtoForUuid(TermNodeDto node);
37
    public void setTreeDtoForUuid(TermTreeDto tree);
36 38
    public boolean checkDuplicates(UUID termUuid, UUID treeUuid) ;
37 39

  
38 40

  

Also available in: Unified diff