Project

General

Profile

« Previous | Next » 

Revision 7114eadf

Added by Patrick Plitzner over 6 years ago

ref #6806 clear taxon filter before saving it

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/WorkingSetEditor.java
219 219
        }
220 220
        Object input = composite.getTaxonNodeTree().getInput();
221 221
        if(input!=null){
222
            workingSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter
222 223
            Collection<ITaxonTreeNode> taxonNodes = (Collection<ITaxonTreeNode>) input;
223 224
            for (ITaxonTreeNode taxonTreeNode : taxonNodes) {
224 225
                if(taxonTreeNode instanceof TaxonNode){
225 226
                    TaxonNode taxonNode = (TaxonNode)taxonTreeNode;
226 227
                    workingSet.addTaxonSubtree(taxonNode);
227
                    Set<NamedArea> descriptions;
228
                    if(taxonNode!=null && taxonNode.getTaxon()!=null){
228
                    if(taxonNode.getTaxon()!=null){
229 229
                        Taxon taxon = HibernateProxyHelper.deproxy(taxonNode.getTaxon(), Taxon.class);
230 230
                        Collection<SpecimenOrObservationBase> specimens = CdmStore.getService(IOccurrenceService.class).listByAssociatedTaxon(SpecimenOrObservationBase.class, null, taxon, null, null, null, null, null);
231 231
                        for (SpecimenOrObservationBase specimen : specimens) {

Also available in: Unified diff