Project

General

Profile

« Previous | Next » 

Revision 41fe4def

Added by Katja Luther over 2 years ago

ref #9772: avoid NPE in aggregation handler - continue

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
9 9 
package eu.etaxonomy.taxeditor.ui.dialog.configurator;
10 10 

  		




  11
  11
  
    
import java.util.List;


  		




  
  12
  
    
import java.util.UUID;


  		




  12
  13
  
    

  		




  13
  14
  
    
import org.eclipse.jface.wizard.Wizard;


  		




  14
  15
  
    

  		




  ......




  68
  69
  
    
//        }


  		




  69
  70
  
    
        TaxonNodeFilter filter = configurator.getTaxonNodeFilter();


  		




  70
  71
  
    
        if (!page.useHigherLevel()) {


  		




  71
  
  
    
            filter.setRankMax(dataSet.getMaxRank().getUuid());


  		




  72
  
  
    
            filter.setRankMin(dataSet.getMinRank().getUuid());


  		




  73
  
  
    

  		




  74
  
  
    
            for (TermDto namedArea : dataSet.getGeoFilter()) {


  		




  75
  
  
    
                filter = filter.orArea(namedArea.getUuid());


  		




  
  72
  
    
            UUID minRankUuid = dataSet.getMinRank() != null? dataSet.getMinRank().getUuid(): null;


  		




  
  73
  
    
            UUID maxRankUuid = dataSet.getMinRank() != null? dataSet.getMaxRank().getUuid(): null;


  		




  
  74
  
    
            filter.setRankMax(maxRankUuid);


  		




  
  75
  
    
            filter.setRankMin(minRankUuid);


  		




  
  76
  
    

  		




  
  77
  
    
            if (dataSet.getGeoFilter() != null){


  		




  
  78
  
    
                for (TermDto namedArea : dataSet.getGeoFilter()) {


  		




  
  79
  
    
                    filter = filter.orArea(namedArea.getUuid());


  		




  
  80
  
    
                }


  		




  76
  81
  
    
            }


  		




  77
  82
  
    
            //TODO: check whether this is correct!!!!


  		




  78
  83
  
    
            for (TaxonNode node: page.getSelectedTaxonNodes()) {


  		












Also available in:  Unified diff