Revision f5979052
Added by Katja Luther over 6 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java | ||
---|---|---|
16 | 16 |
import org.eclipse.swt.widgets.Shell; |
17 | 17 |
import org.eclipse.swt.widgets.Text; |
18 | 18 |
|
19 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
|
20 | 19 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
21 | 20 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
22 | 21 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
... | ... | |
33 | 32 |
public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonBase> { |
34 | 33 |
|
35 | 34 |
|
36 |
public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) { |
|
37 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation, |
|
35 |
public static TaxonBase selectTaxonBase(Shell shell){//, ConversationHolder conversation) {
|
|
36 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, //conversation,
|
|
38 | 37 |
"Choose a taxon/synonym", false, null, null); |
39 | 38 |
return getSelectionFromDialog(dialog); |
40 | 39 |
} |
41 | 40 |
|
42 |
public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) { |
|
41 |
public static Taxon selectTaxon(Shell shell, //ConversationHolder conversation, |
|
42 |
Taxon taxonToBeFiltered) { |
|
43 | 43 |
|
44 | 44 |
|
45 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation, |
|
45 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, //conversation,
|
|
46 | 46 |
"Choose a taxon", false, null, taxonToBeFiltered); |
47 | 47 |
return (Taxon) getSelectionFromDialog(dialog); |
48 | 48 |
} |
49 | 49 |
|
50 |
public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) { |
|
51 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation, |
|
50 |
public static Synonym selectSynonym(Shell shell){//, ConversationHolder conversation) {
|
|
51 |
AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, //conversation,
|
|
52 | 52 |
"Choose a synonym", false, null, null); |
53 | 53 |
return (Synonym) getSelectionFromDialog(dialog); |
54 | 54 |
} |
55 | 55 |
|
56 | 56 |
private final Class<? extends TaxonBase> clazz; |
57 | 57 |
|
58 |
protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) { |
|
59 |
super(shell, conversation, title, multi, TaxonBaseSelectionDialog.class.getCanonicalName(), taxon); |
|
58 |
protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, //ConversationHolder conversation, |
|
59 |
String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) { |
|
60 |
super(shell, //conversation, |
|
61 |
title, multi, TaxonBaseSelectionDialog.class.getCanonicalName(), taxon); |
|
60 | 62 |
this.cdmBaseToBeFiltered = taxonToBeFiltered; |
61 | 63 |
this.clazz = clazz; |
62 | 64 |
search(); |
Also available in: Unified diff
fix multiple representation by removing conversation of selection dialog