Project

General

Profile

« Previous | Next » 

Revision 4ff8bf0c

Added by Katja Luther almost 2 years ago

some changes in reference selection dialog to add a list of preselected references

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameReferenceSelectionDialog.java
31 31
     * @param reference
32 32
     */
33 33
    protected CommonNameReferenceSelectionDialog(Shell shell, String title, boolean multi, Reference reference) {
34
        super(shell, title, multi, reference);
34
        super(shell, title, multi, reference, null);
35 35

  
36 36
    }
37 37

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
53 53
    private Reference currentReference;
54 54
    List<String> lastSelectedReferences = null;
55 55
    Map<UUID, AlternativeIdentifier> identifierMap;
56
    Set<Reference> preSelectedReferences = new HashSet<>();
56 57

  
57 58
	/**
58 59
	 * <p>select</p>
......
80 81
    public static Reference select(Shell shell, //ConversationHolder conversation,
81 82
            Reference reference) {
82 83
        ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, //conversation,
83
                "Choose a reference", false, reference);
84
                "Choose a reference", false, reference, null);
85
        return getSelectionFromDialog(dialog);
86
    }
87

  
88
    public static Reference select(Shell shell, String title,
89
            Reference reference, Set<Reference> preSelectedReferences) {
90
        ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, //conversation,
91
                title, false, reference, preSelectedReferences);
84 92
        return getSelectionFromDialog(dialog);
85 93
    }
86 94

  
87 95

  
88 96

  
97

  
89 98
	/**
90 99
	 * <p>Constructor for FilteredReferenceSelectionDialog.</p>
91 100
	 *
......
96 105
	 * @param multi a boolean.
97 106
	 */
98 107
	protected ReferenceSelectionDialog(Shell shell, //ConversationHolder conversation,
99
	        String title, boolean multi, Reference reference) {
108
	        String title, boolean multi, Reference reference, Set<Reference> preSelectedReferences) {
100 109
		super(shell, //conversation,
101 110
		        title, multi, ReferenceSelectionDialog.class.getCanonicalName(), reference);
102 111
		this.currentReference = reference;
103

  
112
		this.preSelectedReferences = preSelectedReferences;
104 113

  
105 114
	}
106 115

  
......
159 168
	        for (String uuidString: lastSelectedReferences){
160 169
	            uuids.add(UUID.fromString(uuidString));
161 170
	        }
171
	        if (preSelectedReferences != null){
172
    	        for (Reference ref: preSelectedReferences){
173
                    uuids.add(ref.getUuid());
174
                }
175
	        }
162 176
	        if (!uuids.isEmpty()){
163 177
	            if (currentReference != null){
164 178
	                uuids.remove(currentReference.getUuid());

Also available in: Unified diff