Revision 3a77d114
Added by Katja Luther over 5 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistLabelProvider.java | ||
---|---|---|
123 | 123 |
} |
124 | 124 |
} |
125 | 125 |
|
126 |
if(columnIndex >2 || (!PreferencesUtil.isShowRankInChecklistEditor() && columnIndex > 0)){
|
|
126 |
if(columnIndex >1 || (!PreferencesUtil.isShowRankInChecklistEditor() && columnIndex > 0)){
|
|
127 | 127 |
|
128 | 128 |
for (TaxonDescription td : listTaxonDescriptions) { |
129 | 129 |
for (DescriptionElementBase deb : td.getElements()) { |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditingSupportE4.java | ||
---|---|---|
196 | 196 |
|
197 | 197 |
if (namedAreas != null) { |
198 | 198 |
for (DefinedTermBase term : namedAreas) { |
199 |
boolean sameArea = true; |
|
200 |
if (!PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){ |
|
201 |
sameArea = column.getText().equalsIgnoreCase(term.getTitleCache()); |
|
202 |
} else{ |
|
203 |
if (term.getIdInVocabulary() != null){ |
|
204 |
sameArea = column.getText().equalsIgnoreCase(term.getIdInVocabulary()); |
|
205 |
} else{ |
|
206 |
sameArea = column.getText().equalsIgnoreCase(term.getTitleCache()); |
|
207 |
} |
|
208 |
} |
|
209 |
if (sameArea) { |
|
199 |
Integer areaIndex = editor.getAreaPosition().get(term.getUuid()); |
|
200 |
if (areaIndex == columnIndex){ |
|
210 | 201 |
NamedArea area = (NamedArea) term; |
211 | 202 |
Distribution distribution = Distribution.NewInstance(area, occurenceStatus); |
212 | 203 |
Set<TaxonDescription> descriptions = taxon.getDescriptions(); |
... | ... | |
221 | 212 |
td.addElement(distribution); |
222 | 213 |
break; |
223 | 214 |
} |
215 |
|
|
224 | 216 |
} |
217 |
|
|
225 | 218 |
} |
226 | 219 |
} |
227 | 220 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java | ||
---|---|---|
99 | 99 |
try { |
100 | 100 |
|
101 | 101 |
checkChildren(event.getElement(), event.getChecked()); |
102 |
|
|
103 | 102 |
grayParents(event.getElement()); |
103 |
((CheckboxTreeViewer)getViewer()).refresh(); |
|
104 | 104 |
} |
105 | 105 |
finally { |
106 | 106 |
ignoreCheckEvent = false; |
... | ... | |
198 | 198 |
return; |
199 | 199 |
} |
200 | 200 |
// final Object element = path.getLastSegment(); |
201 |
if (element != null) { |
|
201 |
// if (element != null) {
|
|
202 | 202 |
((CheckboxTreeViewer)getViewer()).setChecked(element, checked); |
203 | 203 |
((CheckboxTreeViewer)getViewer()).setGrayed(element, false); |
204 |
int length = tcp.getChildren(element).length; |
|
205 |
if(length>1){ |
|
206 |
((CheckboxTreeViewer)getViewer()).expandToLevel(element, CheckboxTreeViewer.ALL_LEVELS); |
|
207 |
((CheckboxTreeViewer)getViewer()).setSubtreeChecked(element, checked); |
|
208 |
} |
|
209 |
} |
|
204 |
// int length = tcp.getChildren(element).length; |
|
205 |
// if(length>1){ |
|
206 |
// |
|
207 |
// ((CheckboxTreeViewer)getViewer()).expandToLevel(element, CheckboxTreeViewer.ALL_LEVELS); |
|
208 |
// ((CheckboxTreeViewer)getViewer()).setSubtreeChecked(element, checked); |
|
209 |
// } |
|
210 |
// } |
|
210 | 211 |
} |
211 | 212 |
/** |
212 | 213 |
* |
... | ... | |
231 | 232 |
if (allUnchecked) { |
232 | 233 |
((CheckboxTreeViewer)getViewer()).setChecked(parent, false); |
233 | 234 |
((CheckboxTreeViewer)getViewer()).setGrayed(parent, false); |
234 |
} else if (allChecked) { |
|
235 |
((CheckboxTreeViewer)getViewer()).setChecked(parent, true); |
|
236 |
((CheckboxTreeViewer)getViewer()).setGrayed(parent, false); |
|
237 |
} else if (!allUnchecked && !allChecked) { |
|
238 |
((CheckboxTreeViewer)getViewer()).setChecked(parent, true); |
|
239 |
((CheckboxTreeViewer)getViewer()).setGrayed(parent, true); |
|
235 |
} else { |
|
236 |
// ((CheckboxTreeViewer)getViewer()).setChecked(parent, false); |
|
237 |
boolean result = ((CheckboxTreeViewer)getViewer()).setGrayed(parent, true); |
|
238 |
|
|
239 |
|
|
240 | 240 |
} |
241 | 241 |
|
242 | 242 |
grayParents(tcp.getParent(parent)); |
Also available in: Unified diff
ref #7063: work in progress: selection in treeview of namedAreas for distribution editor should be more reasonable