Project

General

Profile

« Previous | Next » 

Revision 5c9a95f8

Added by Katja Luther almost 4 years ago

fix CCE in descriptive dataset editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetEditor.java
224 224 
        }
225 225 
        Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
226 226 
        if(taxonSubtreeFilter!=null){
227 
            composite.getTaxonNodeTree().setInput(taxonSubtreeFilter);
227 
            Set<TaxonNodeDto> dtoSet = new HashSet<>();
228 
            for (TaxonNode node: taxonSubtreeFilter){
229 
                dtoSet.add(new TaxonNodeDto(node));
230 
            }
231 
            composite.getTaxonNodeTree().setInput(dtoSet);
228 232 
        }
229 233 
        composite.getTxt_label().addModifyListener(labelModifyListener);
230 234 
        composite.getTxt_label().addFocusListener(new FocusAdapter() {
......
239 243 
    }
240 244 

  		




  241
  245
  
    
    public void addTaxonNode(TaxonNodeDto taxonNodeDto){


  		




  242
  
  
    
        TaxonNode taxonNode = cdmEntitySession.remoteLoad(CdmStore.getService(ITaxonNodeService.class), taxonNodeDto.getUuid());


  		




  
  246
  
    
//        TaxonNode taxonNode = cdmEntitySession.remoteLoad(CdmStore.getService(ITaxonNodeService.class), taxonNodeDto.getUuid());


  		




  243
  247
  
    
        //check if node belongs to same classification


  		




  244
  248
  
    
        Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();


  		




  245
  249
  
    
        if(taxonSubtreeFilter!=null && !taxonSubtreeFilter.isEmpty()){


  		




  246
  
  
    
            if(!taxonSubtreeFilter.iterator().next().getClassification().equals(taxonNode.getClassification())){


  		




  
  250
  
    
            if(!taxonSubtreeFilter.iterator().next().getClassification().getUuid().equals(taxonNodeDto.getClassificationUUID())){


  		




  247
  251
  
    
                MessagingUtils.warningDialog(Messages.TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH, this.getClass(),


  		




  248
  252
  
    
                        Messages.TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH_MESSAGE);


  		




  249
  253
  
    
                return;


  		




  ......




  296
  300
  
    
        Object input = composite.getTaxonNodeTree().getInput();


  		




  297
  301
  
    
        if(input!=null){


  		




  298
  302
  
    
            descriptiveDataSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter


  		




  299
  
  
    
            Collection<TaxonNode> taxonNodes = (Collection<TaxonNode>) input;


  		




  300
  
  
    
            for (TaxonNode taxonTreeNode : taxonNodes) {


  		




  301
  
  
    
//                TaxonNode taxonNode =  CdmStore.getService(ITaxonNodeService.class).load(taxonTreeNode.getUuid());


  		




  302
  
  
    
                descriptiveDataSet.addTaxonSubtree(taxonTreeNode);


  		




  
  303
  
    
            Collection<TaxonNodeDto> taxonNodes = (Collection<TaxonNodeDto>) input;


  		




  
  304
  
    
            for (TaxonNodeDto taxonTreeNode : taxonNodes) {


  		




  
  305
  
    
                TaxonNode taxonNode =  CdmStore.getService(ITaxonNodeService.class).load(taxonTreeNode.getUuid());


  		




  
  306
  
    
                descriptiveDataSet.addTaxonSubtree(taxonNode);


  		




  303
  307
  
    
            }


  		




  304
  308
  
    
        }


  		




  305
  309
  
    
        TermTree<Feature> characters = composite.getCharacters();


  		












Also available in:  Unified diff