Project

General

Profile

« Previous | Next » 

Revision 7c7fe429

Added by Katja Luther over 6 years ago

revert changes in selection dialogs for enums

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
36 36
	 * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
37 37
	 */
38 38
	public static OriginalSourceType select(Shell shell, ConversationHolder conversation){
39
		OriginalSourceTypeSelectionDialog dialog = 
40
				new OriginalSourceTypeSelectionDialog(shell, 
39
		OriginalSourceTypeSelectionDialog dialog =
40
				new OriginalSourceTypeSelectionDialog(shell,
41 41
						conversation,
42
						"Choose Original Source Type", 
43
						false, 
42
						"Choose Original Source Type",
43
						false,
44 44
						OriginalSourceTypeSelectionDialog.class.getCanonicalName());
45 45
		return getSelectionFromDialog(dialog);
46 46
	}
47
	
47

  
48 48
	/**
49 49
	 * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
50 50
	 *
......
54 54
	 * @param multi a boolean.
55 55
	 * @param settings a {@link java.lang.String} object.
56 56
	 */
57
	protected OriginalSourceTypeSelectionDialog(Shell shell, 
58
			ConversationHolder conversation, 
57
	protected OriginalSourceTypeSelectionDialog(Shell shell,
58
			ConversationHolder conversation,
59 59
			String title,
60
			boolean multi, 
60
			boolean multi,
61 61
			String settings) {
62 62
		super(shell, conversation, title, multi, settings, OriginalSourceType.PrimaryTaxonomicSource);
63 63
	}
......
65 65

  
66 66
	/** {@inheritDoc} */
67 67
	@Override
68
	protected void search() {
68
	protected void initModel() {
69 69
		model = new ArrayList<OriginalSourceType>();
70
		model.addAll(EnumSet.allOf(OriginalSourceType.class));		
70
		model.addAll(EnumSet.allOf(OriginalSourceType.class));
71 71
	}
72 72

  
73 73
	/** {@inheritDoc} */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
29 29
	 * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
30 30
	 */
31 31
	public static SpecimenOrObservationType select(Shell shell, ConversationHolder conversation){
32
		SpecimenOrObservationTypeSelectionDialog dialog = 
33
				new SpecimenOrObservationTypeSelectionDialog(shell, 
32
		SpecimenOrObservationTypeSelectionDialog dialog =
33
				new SpecimenOrObservationTypeSelectionDialog(shell,
34 34
						conversation,
35
						"Choose Specimen / Observation Type", 
36
						false, 
35
						"Choose Specimen / Observation Type",
36
						false,
37 37
						SpecimenOrObservationTypeSelectionDialog.class.getCanonicalName());
38 38
		return getSelectionFromDialog(dialog);
39 39
	}
40
	
40

  
41 41
	/**
42 42
	 * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
43 43
	 *
......
47 47
	 * @param multi a boolean.
48 48
	 * @param settings a {@link java.lang.String} object.
49 49
	 */
50
	protected SpecimenOrObservationTypeSelectionDialog(Shell shell, 
51
			ConversationHolder conversation, 
50
	protected SpecimenOrObservationTypeSelectionDialog(Shell shell,
51
			ConversationHolder conversation,
52 52
			String title,
53
			boolean multi, 
53
			boolean multi,
54 54
			String settings) {
55 55
		super(shell, conversation, title, multi, settings, SpecimenOrObservationType.Unknown);
56 56
	}
......
58 58

  
59 59
	/** {@inheritDoc} */
60 60
	@Override
61
	protected void search() {
61
	protected void initModel() {
62 62
		model = new ArrayList<SpecimenOrObservationType>();
63
		model.addAll(EnumSet.allOf(SpecimenOrObservationType.class));		
63
		model.addAll(EnumSet.allOf(SpecimenOrObservationType.class));
64 64
	}
65 65

  
66 66
	/** {@inheritDoc} */

Also available in: Unified diff