Project

General

Profile

« Previous | Next » 

Revision dcb4e6c9

Added by Katja Luther over 5 years ago

ref #6800: add missing taxonnode filter when selecting all classification

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java
10 10
package eu.etaxonomy.taxeditor.io.e4.out.dwca;
11 11

  
12 12
import java.io.File;
13
import java.util.UUID;
13 14

  
14 15
import javax.inject.Inject;
15 16
import javax.inject.Named;
......
68 69
	public boolean performFinish() {
69 70
		String urlString = page.getFolderText() + File.separator
70 71
				+ page.getExportFileName();
71

  
72
		
73
		if (!page.getCheckUseSelectedTaxonNode()){
74
			configurator.getTaxonNodeFilter().reset();
75
			if (!page.getCheckUseAllClassifications()){
76
				configurator.getTaxonNodeFilter().orClassification(page.getSelectedClassificationUUID());
77
			}else{
78
				for (UUID classificationUuid: page.getAllClassificationUuids()){
79
					configurator.getTaxonNodeFilter().orClassification(classificationUuid);
80
				}
81
				
82
			}
83
		}
84
		
72 85

  
73 86
		CdmStore.getExportManager().runMoniteredOperation(configurator, urlString);
74 87
		return true;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
13 13
import java.util.Calendar;
14 14
import java.util.Collections;
15 15
import java.util.Comparator;
16
import java.util.HashSet;
16 17
import java.util.List;
18
import java.util.Set;
17 19
import java.util.UUID;
18 20

  
19 21
import org.eclipse.jface.wizard.WizardPage;
......
294 296
			               @Override
295 297
			               public void handleEvent(Event e) {
296 298
			            	   Button b = (Button) e.widget;
297
				                GridData data = (GridData)  classificationSelectionCombo.getLayoutData();
298
				                data.exclude = b.getSelection();
299
				                classificationSelectionCombo.setVisible(!data.exclude);
299
				               GridData data = (GridData)  classificationSelectionCombo.getLayoutData();
300
				               data.exclude = b.getSelection();
301
				               classificationSelectionCombo.setVisible(!data.exclude);
302
				               
300 303
			               }
301 304
					  	});
302 305
				  }  
......
470 473
		}
471 474
		return checkUseSelectedtaxonNode.getSelection();
472 475
	}
476
	public boolean getCheckUseAllClassifications() {
477
		if (checkUseAllClassification== null){
478
			return false;
479
		}
480
		return checkUseAllClassification.getSelection();
481
	}
482
	
483
	public Set<UUID> getAllClassificationUuids(){
484
		Set<UUID> allClassificationUuids = new HashSet();
485
		for (Classification classification: this.classifications){
486
			allClassificationUuids.add(classification.getUuid());
487
		}
488
		return allClassificationUuids;
489
	}
473 490

  
474 491
	@Override
475 492
	public boolean canFlipToNextPage() {

Also available in: Unified diff