Revision 321b9521
Added by Katja Luther over 5 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java | ||
---|---|---|
136 | 136 |
private Label statusLabel; |
137 | 137 |
|
138 | 138 |
private ChecklistLabelProvider labelProvider; |
139 |
//TODO: maybe it is better to use a hashMap for better handling of adding and removing terms?? |
|
139 |
|
|
140 | 140 |
private Map<UUID, Integer> areaPosition= new HashMap(); |
141 | 141 |
|
142 | 142 |
private ToolItem toolItem; |
... | ... | |
194 | 194 |
|
195 | 195 |
|
196 | 196 |
|
197 |
labelProvider = new ChecklistLabelProvider(this.viewer);
|
|
197 |
labelProvider = new ChecklistLabelProvider(this); |
|
198 | 198 |
// SortedSet<DefinedTermBase> termSet = labelProvider.getNamedAreas(true); |
199 | 199 |
// terms = new HashMap(); |
200 | 200 |
// for (DefinedTermBase term : termSet){ |
... | ... | |
406 | 406 |
} else{ |
407 | 407 |
titles.add(term.getTitleCache()); |
408 | 408 |
} |
409 |
}else{ |
|
409 |
}else if (PreferencesUtil.isShowSymbol1InChecklistEditor()){ |
|
410 |
if (term.getSymbol() != null){ |
|
411 |
titles.add(term.getSymbol()); |
|
412 |
} else{ |
|
413 |
titles.add(term.getTitleCache()); |
|
414 |
} |
|
415 |
}else if (PreferencesUtil.isShowSymbol2InChecklistEditor()){ |
|
416 |
if (term.getSymbol2() != null){ |
|
417 |
titles.add(term.getSymbol2()); |
|
418 |
} else{ |
|
419 |
titles.add(term.getTitleCache()); |
|
420 |
} |
|
421 |
}{ |
|
410 | 422 |
titles.add(term.getTitleCache()); |
411 | 423 |
} |
412 | 424 |
bounds.add(200); |
... | ... | |
722 | 734 |
|
723 | 735 |
public void doSave(IProgressMonitor monitor) { |
724 | 736 |
try { |
725 |
monitor.beginTask(Messages.ChecklistEditor_SAVE_EDITOR, 1); |
|
726 |
if (!conversation.isBound()) { |
|
727 |
conversation.bind(); |
|
728 |
} |
|
737 |
// monitor.beginTask(Messages.ChecklistEditor_SAVE_EDITOR, 1);
|
|
738 |
// if (!conversation.isBound()) {
|
|
739 |
// conversation.bind();
|
|
740 |
// }
|
|
729 | 741 |
|
730 | 742 |
this.checklistEditorInput.merge(); |
731 | 743 |
|
732 |
conversation.commit(true); |
|
744 |
//conversation.commit(true);
|
|
733 | 745 |
setDirty(false); |
734 |
monitor.worked(1); |
|
746 |
// monitor.worked(1);
|
|
735 | 747 |
} finally { |
736 |
monitor.done(); |
|
748 |
// monitor.done();
|
|
737 | 749 |
} |
738 | 750 |
|
739 | 751 |
} |
Also available in: Unified diff
ref #7793: fix problem with details view after save in distribution editor