Project

General

Profile

« Previous | Next » 

Revision f5979052

Added by Katja Luther over 6 years ago

fix multiple representation by removing conversation of selection dialog

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
27 27
import org.eclipse.swt.widgets.Text;
28 28
import org.eclipse.wb.swt.ResourceManager;
29 29

  
30
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
31 30
import eu.etaxonomy.cdm.api.service.ITermService;
32 31
import eu.etaxonomy.cdm.api.service.IVocabularyService;
33 32
import eu.etaxonomy.cdm.model.common.CdmBase;
......
88 87
	 * @param preselectedVocabularyUuids the {@link UUID}s of the pre-selected vocabularies
89 88
	 * @return a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
90 89
	 */
91
	public static NamedArea select(Shell shell, ConversationHolder conversation, NamedArea namedArea, String preferenceId, UUID... preselectedVocabularyUuids) {
92
		NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell, conversation,
90
	public static NamedArea select(Shell shell, //ConversationHolder conversation,
91
	        NamedArea namedArea, String preferenceId, UUID... preselectedVocabularyUuids) {
92
		NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell, //conversation,
93 93
				"Choose an area", false, namedArea, preferenceId, preselectedVocabularyUuids);
94 94
		return getSelectionFromDialog(dialog);
95 95
	}
96 96

  
97
	protected NamedAreaSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, NamedArea namedArea, Object preferenceId, UUID... preselectedVocabularyUuids) {
98
		super(shell, conversation, title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);
97
	protected NamedAreaSelectionDialog(Shell shell, //ConversationHolder conversation,
98
	        String title, boolean multi, NamedArea namedArea, Object preferenceId, UUID... preselectedVocabularyUuids) {
99
		super(shell, //conversation,
100
		        title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);
99 101
		this.preferenceID = preferenceId;
100 102
		preselectedVocabularies = new ArrayList<TermVocabulary>();
101 103
		for(int i=0;i<preselectedVocabularyUuids.length;i++){

Also available in: Unified diff