Project

General

Profile

« Previous | Next » 

Revision 85b120fd

Added by Patrick Plitzner over 6 years ago

Revert term combo initialization changes

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
172 172
		int i = 1;
173 173
		int index = 0;
174 174

  
175
		if(addEmptyElement){
176
		    // Add an empty element for when nothing was selected yet
177
		    combo.add(EMPTY_ELEMENT_LABEL);
178
		    terms.add(emptyElement);
179
		}
180

  
175 181
		if (termComparator != null) {
176 182
			Collections.sort(preferredTerms, termComparator);
177 183
		}
178
		terms.addAll(preferredTerms);
179

  
180
		List<String> labels = new ArrayList<>();
181 184
		for (T term : preferredTerms) {
182 185
			String label = getLabel(term);
183 186
			if (label == null) {
......
195 198

  
196 199
			}
197 200

  
198
			labels.add(label);
201
			combo.add(label);
202
			terms.add(term);
199 203

  
200 204
			i++;
201 205
			if (selection != null) {
......
205 209
			}
206 210
		}
207 211

  
208
		String[] items = labels.toArray(new String[0]);
209
        combo.setItems(items);
210

  
211
        if(addEmptyElement){
212
            // Add an empty element for when nothing was selected yet
213
            combo.add(EMPTY_ELEMENT_LABEL, 0);
214
            terms.add(0, emptyElement);
215
        }
216

  
217 212
        if (selection != null && index == 0) {
218 213
			createTermNotInPreferredTerms(selection);
219 214
		}

Also available in: Unified diff