Project

General

Profile

« Previous | Next » 

Revision 458132f7

Added by Katja Luther over 3 years ago

ref #8774: fix refresh after remove featurenode

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterNodeDtoTransfer.java
24 24 

  		




  25
  25
  
    
import eu.etaxonomy.cdm.api.service.ITermNodeService;


  		




  26
  26
  
    
import eu.etaxonomy.cdm.model.term.TermNode;


  		




  
  27
  
    
import eu.etaxonomy.cdm.model.term.TermTree;


  		




  27
  28
  
    
import eu.etaxonomy.cdm.persistence.dto.CharacterNodeDto;


  		




  28
  29
  
    
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;


  		




  
  30
  
    
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;


  		




  29
  31
  
    
import eu.etaxonomy.taxeditor.model.MessagingUtils;


  		




  30
  32
  
    
import eu.etaxonomy.taxeditor.store.CdmStore;


  		




  31
  33
  
    

  		




  ......




  133
  135
  
    

  		




  134
  136
  
    
    public CharacterNodeDto loadElement(UUID uuid){


  		




  135
  137
  
    
        TermNode node = CdmStore.getService(ITermNodeService.class).load(uuid);


  		




  136
  
  
    
        return CharacterNodeDto.fromTermNode(node);


  		




  
  138
  
    
        TermTreeDto tree = TermTreeDto.fromTree((TermTree)node.getGraph());


  		




  
  139
  
    
        return CharacterNodeDto.fromTermNode(node, tree);


  		




  137
  140
  
    
    }


  		




  138
  141
  
    

  		




  139
  142
  
    
    public UUID readElementUuid(DataInputStream in) throws IOException{


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeDtoTransfer.java
    
  





  133
  133
  
    

  		




  134
  134
  
    
    public TermNodeDto loadElement(UUID uuid){


  		




  135
  135
  
    
        TermNode<Feature> node = CdmStore.getService(ITermNodeService.class).load(uuid);


  		




  136
  
  
    
        return TermNodeDto.fromNode(node);


  		




  
  136
  
    
        return TermNodeDto.fromNode(node, null);


  		




  137
  137
  
    
    }


  		




  138
  138
  
    

  		




  139
  139
  
    
    public UUID readElementUuid(DataInputStream in) throws IOException{


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureHandler.java
    
  





  22
  22
  
    
import org.eclipse.jface.viewers.TreeSelection;


  		




  23
  23
  
    

  		




  24
  24
  
    
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;


  		




  
  25
  
    
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;


  		




  
  26
  
    
import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;


  		




  
  27
  
    
import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;


  		




  25
  28
  
    
import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;


  		




  26
  29
  
    
import eu.etaxonomy.taxeditor.featuretree.e4.operation.RemoveFeatureOperation;


  		




  27
  30
  
    
import eu.etaxonomy.taxeditor.store.StoreUtil;


  		




  ......




  51
  54
  
    

  		




  52
  55
  
    
        for (Object selectedObject : selection.toArray()) {


  		




  53
  56
  
    
        	TermNodeDto featureNode = (TermNodeDto) selectedObject;


  		




  54
  
  
    

  		




  
  57
  
    
        	TermTreeDto tree = featureNode.getTree();


  		




  55
  58
  
    
            RemoveFeatureOperation operation = new RemoveFeatureOperation(featureNode.getUuid(), editor, editor);


  		




  56
  
  
    
    //      AbstractUtility.executeOperation(operation, sync);


  		




  57
  59
  
    
            editor.addOperation(operation);


  		




  58
  60
  
    

  		




  59
  
  
    
//            featureNode.getTree().removeChild(featureNode);


  		




  60
  61
  
    
            ISelection sel = editor.getViewer().getSelection();


  		




  61
  62
  
    
            if (sel instanceof TreeSelection){


  		




  62
  63
  
    
                Object o =((TreeSelection) sel).getFirstElement();


  		




  ......




  65
  66
  
    
                    parent.removeChild(featureNode);


  		




  66
  67
  
    
                }


  		




  67
  68
  
    
            }


  		




  68
  
  
    
            editor.refresh();


  		




  
  69
  
    
//            editor.refresh();


  		




  69
  70
  
    
//            }else{


  		




  70
  71
  
    
//                for (Object treeDto: ((AbstractTermTreeEditor)editor).getTrees()){


  		




  71
  72
  
    
//                    if (treeDto instanceof TermTreeDto && ((TermTreeDto)treeDto).getUuid().equals(featureNode.getTree().getUuid())){


  		




  ......




  73
  74
  
    
//                    }


  		




  74
  75
  
    
//


  		




  75
  76
  
    
//                }


  		




  76
  
  
    
//                ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());


  		




  
  77
  
    
                if (editor instanceof AbstractTermTreeEditor){


  		




  
  78
  
    
                    ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());


  		




  
  79
  
    
                }else{


  		




  
  80
  
    
                    ((ICharacterEditor)editor).getViewer().setInput(tree);


  		




  
  81
  
    
                }


  		




  77
  82
  
    
//            }


  		




  78
  83
  
    

  		




  79
  84
  
    
            editor.setDirty();


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/InapplicableIfEntityCollectionSectionForNode.java
    
  





  58
  58
  
    
     */


  		




  59
  59
  
    
    @Override


  		




  60
  60
  
    
    public FeatureState createNewElement() {


  		




  61
  
  
    
        FeatureStateWizard wizard = new FeatureStateWizard(TermNodeDto.fromNode(getEntity()), formFactory);


  		




  
  61
  
    
        FeatureStateWizard wizard = new FeatureStateWizard(TermNodeDto.fromNode(getEntity(), null), formFactory);


  		




  62
  62
  
    
        WizardDialog dialog = new WizardDialog(getLayoutComposite().getShell(), wizard);


  		




  63
  63
  
    
        int status = dialog.open();


  		




  64
  64
  
    
        if(status == IStatus.OK) {


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/OnlyApplicableIfEntityCollectionSectionForNode.java
    
  





  57
  57
  
    
     */


  		




  58
  58
  
    
    @Override


  		




  59
  59
  
    
    public FeatureState createNewElement() {


  		




  60
  
  
    
        FeatureStateWizard wizard = new FeatureStateWizard(TermNodeDto.fromNode(getEntity()), formFactory);


  		




  
  60
  
    
        FeatureStateWizard wizard = new FeatureStateWizard(TermNodeDto.fromNode(getEntity(), null), formFactory);


  		




  61
  61
  
    
        WizardDialog dialog = new WizardDialog(getLayoutComposite().getShell(), wizard);


  		




  62
  62
  
    
        int status = dialog.open();


  		




  63
  63
  
    
        if(status == IStatus.OK) {


  		












Also available in:  Unified diff