Revision d812f38a
Added by Katja Luther over 8 years ago
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java | ||
---|---|---|
28 | 28 |
|
29 | 29 |
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; |
30 | 30 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator; |
31 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator.ChildHandling;
|
|
31 |
import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling; |
|
32 | 32 |
import eu.etaxonomy.cdm.model.common.ITreeNode; |
33 | 33 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
34 | 34 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java | ||
---|---|---|
24 | 24 |
|
25 | 25 |
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; |
26 | 26 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator; |
27 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator.ChildHandling;
|
|
27 |
import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling; |
|
28 | 28 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
29 | 29 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
30 | 30 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java | ||
---|---|---|
163 | 163 |
viewer.setInput(featureTree); |
164 | 164 |
|
165 | 165 |
text_title.removeModifyListener(this); |
166 |
text_title.setText(featureTree.getTitleCache()); |
|
166 |
if (featureTree != null){ |
|
167 |
text_title.setText(featureTree.getTitleCache()); |
|
168 |
} |
|
167 | 169 |
text_title.addModifyListener(this); |
168 | 170 |
} |
169 | 171 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java | ||
---|---|---|
163 | 163 |
@Override |
164 | 164 |
public void widgetSelected(SelectionEvent e) { |
165 | 165 |
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); |
166 |
Object source = e.getSource(); |
|
166 | 167 |
for(Object element : selection.toArray()){ |
167 | 168 |
viewer.remove(element); |
168 |
|
|
169 |
((FeatureTreeEditorWizard) getWizard()).setSelectedFeatureTree(null); |
|
169 | 170 |
DeleteResult result = CdmStore.getService(IFeatureTreeService.class).delete(((FeatureTree) element).getUuid()); |
170 | 171 |
|
171 | 172 |
if (result.isError()){ |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java | ||
---|---|---|
120 | 120 |
|
121 | 121 |
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); |
122 | 122 |
} |
123 |
|
|
124 |
@Override |
|
125 |
protected void handleToggleableCacheField() { |
|
126 |
boolean pushedState = toggleable_cache.getState(); |
|
127 |
|
|
128 |
getEntity().setTitleCache(toggleable_cache.getText(), pushedState); |
|
129 |
setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, text_nomenclaturalTitle })); |
|
130 |
updateToggleableCacheField(); |
|
131 |
} |
|
123 | 132 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java | ||
---|---|---|
94 | 94 |
handleToggleableCacheField(); |
95 | 95 |
|
96 | 96 |
} else if (eventSource == toggleable_nomenclaturalTitleCache) { |
97 |
getEntity().setNomenclaturalTitle( |
|
98 |
toggleable_nomenclaturalTitleCache.getText(), |
|
99 |
toggleable_nomenclaturalTitleCache.getState()); |
|
97 |
updateToggleable_nomanclaturalTitleCacheField(); |
|
100 | 98 |
setIrrelevant( |
101 | 99 |
toggleable_nomenclaturalTitleCache.getState(), |
102 | 100 |
Arrays.asList(new Object[] { toggleable_nomenclaturalTitleCache, hasAdditionalMembers })); |
... | ... | |
113 | 111 |
|
114 | 112 |
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null)); |
115 | 113 |
} |
114 |
|
|
115 |
public void updateToggleable_nomanclaturalTitleCacheField() { |
|
116 |
if (!getEntity().isProtectedNomenclaturalTitleCache()) { |
|
117 |
toggleable_nomenclaturalTitleCache.setText(getEntity().getNomenclaturalTitle()); |
|
118 |
} |
|
119 |
} |
|
116 | 120 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java | ||
---|---|---|
250 | 250 |
toggleable_cache.setText(getEntity().getNameCache()); |
251 | 251 |
} |
252 | 252 |
} |
253 |
|
|
254 |
@Override |
|
255 |
protected void handleToggleableCacheField() { |
|
256 |
boolean pushedState = toggleable_cache.getState(); |
|
257 |
|
|
258 |
getEntity().setTitleCache(toggleable_cache.getText(), pushedState); |
|
259 |
setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, text_appendedPhrase, checkbox_anamorphic })); |
|
260 |
updateToggleableCacheField(); |
|
261 |
} |
|
262 |
|
|
263 |
|
|
253 | 264 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java | ||
---|---|---|
154 | 154 |
getEntity().setLsid(textLsid.parseText()); |
155 | 155 |
} |
156 | 156 |
} |
157 |
@Override |
|
158 |
protected void handleToggleableCacheField() { |
|
159 |
boolean pushedState = toggleable_cache.getState(); |
|
160 |
|
|
161 |
getEntity().setTitleCache(toggleable_cache.getText(), pushedState); |
|
162 |
setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, textLsid })); |
|
163 |
updateToggleableCacheField(); |
|
164 |
} |
|
157 | 165 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java | ||
---|---|---|
60 | 60 |
private TextWithLabelElement text_publisher; |
61 | 61 |
private TextWithLabelElement text_referenceAbstract; |
62 | 62 |
private TextWithLabelElement text_series; |
63 |
private TextWithLabelElement text_seriesPart; |
|
63 |
// private TextWithLabelElement text_seriesPart;
|
|
64 | 64 |
private TextWithLabelElement text_volume; |
65 | 65 |
private TextWithLabelElement text_abbrevTitle; |
66 | 66 |
private TextWithLabelElement text_title; |
... | ... | |
162 | 162 |
"Date Published", entity.getDatePublished(), style); |
163 | 163 |
|
164 | 164 |
createUriAndAbstract(this, entity, SWT.NULL); |
165 |
handleToggleableAbbrevTitleField(); |
|
166 |
handleToggleableCacheField(); |
|
165 | 167 |
} |
166 | 168 |
|
167 | 169 |
/* |
... | ... | |
185 | 187 |
// Object[]{text_cache})); |
186 | 188 |
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache()); |
187 | 189 |
toggleableAbbrevCache.setEnabled(getEntity().isProtectedAbbrevTitleCache()); |
188 |
setIrrelevant(toggleable_cache.getState(), Arrays.asList(new Object[] { toggleable_cache }));
|
|
189 |
setIrrelevant(toggleableAbbrevCache.getState(), Arrays.asList(new Object[] { toggleableAbbrevCache}));
|
|
190 |
setIrrelevantReferenceDetail(false);
|
|
191 |
setIrrelevantReferenceDetail(true);
|
|
190 | 192 |
} |
191 | 193 |
|
192 | 194 |
/** |
... | ... | |
360 | 362 |
text_editor = formFactory.createTextWithLabelElement(element, "Editor", |
361 | 363 |
reference.getEditor(), style); |
362 | 364 |
|
363 |
// series part
|
|
365 |
/* series part
|
|
364 | 366 |
text_seriesPart = formFactory.createTextWithLabelElement(element, |
365 | 367 |
"Series", reference.getSeriesPart(), style); |
366 |
|
|
368 |
*/ |
|
367 | 369 |
if (referenceType.equals(ReferenceType.Book)) { |
368 | 370 |
// edition |
369 | 371 |
text_edition = formFactory.createTextWithLabelElement(element, |
... | ... | |
432 | 434 |
getEntity().setPublisher(text_publisher.getText()); |
433 | 435 |
} else if (eventSource == text_referenceAbstract) { |
434 | 436 |
getEntity().setReferenceAbstract(text_referenceAbstract.getText()); |
435 |
} else if (eventSource == text_seriesPart) {
|
|
436 |
getEntity().setSeriesPart(text_seriesPart.getText());
|
|
437 |
} else if (eventSource == text_series) { |
|
438 |
getEntity().setSeriesPart(text_series.getText()); |
|
437 | 439 |
} else if (eventSource == text_title) { |
438 | 440 |
getEntity().setTitle(text_title.getText()); |
439 | 441 |
toggleable_cache.setText(text_title.getText()); |
... | ... | |
474 | 476 |
protected void handleToggleableAbbrevTitleField() { |
475 | 477 |
boolean pushedAbbrevState = toggleableAbbrevCache.getState(); |
476 | 478 |
getEntity().setAbbrevTitleCache(toggleableAbbrevCache.getText(), pushedAbbrevState); |
477 |
setIrrelevant(pushedAbbrevState, Arrays.asList(new Object[] { toggleableAbbrevCache, toggleable_cache, text_title }));
|
|
479 |
setIrrelevantReferenceDetail(true);
|
|
478 | 480 |
updateToggleableCacheField(); |
479 | 481 |
} |
480 | 482 |
|
... | ... | |
548 | 550 |
} |
549 | 551 |
} |
550 | 552 |
} |
553 |
|
|
554 |
@Override |
|
555 |
protected void handleToggleableCacheField() { |
|
556 |
|
|
557 |
boolean pushedState = toggleable_cache.getState(); |
|
558 |
getEntity().setTitleCache(toggleable_cache.getText(), pushedState); |
|
559 |
setIrrelevantReferenceDetail(false); |
|
560 |
updateToggleableCacheField(); |
|
561 |
} |
|
562 |
|
|
563 |
protected void setIrrelevantReferenceDetail(boolean abbrev){ |
|
564 |
|
|
565 |
List<Object> except = new ArrayList(); |
|
566 |
except.addAll( Arrays.asList(new Object[] { toggleable_cache, toggleableAbbrevCache, text_editor, text_isbn, text_issn, text_organisation, text_pages, text_placePublished, text_publisher, text_referenceAbstract, text_uri, selection_institution})); |
|
567 |
boolean pushedState; |
|
568 |
if (abbrev){ |
|
569 |
except.add(text_title); |
|
570 |
pushedState = toggleableAbbrevCache.getState(); |
|
571 |
} else{ |
|
572 |
except.add(text_abbrevTitle); |
|
573 |
pushedState = toggleable_cache.getState(); |
|
574 |
} |
|
575 |
switch( getEntity().getType()){ |
|
576 |
case Journal: |
|
577 |
except.add(element_timePeriod); |
|
578 |
break; |
|
579 |
case Book: |
|
580 |
except.remove(text_series); |
|
581 |
except.remove(text_edition); |
|
582 |
break; |
|
583 |
} |
|
584 |
setIrrelevant(pushedState, except); |
|
585 |
} |
|
551 | 586 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java | ||
---|---|---|
180 | 180 |
((Taxon)getEntity()).setPublish(checkbox_published.getSelection()); |
181 | 181 |
} |
182 | 182 |
} |
183 |
@Override |
|
184 |
protected void handleToggleableCacheField() { |
|
185 |
boolean pushedState = toggleable_cache.getState(); |
|
186 |
|
|
187 |
getEntity().setTitleCache(toggleable_cache.getText(), pushedState); |
|
188 |
setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, text_appendedPhrase, checkbox_published, checkbox_unplaced, checkbox_excluded})); |
|
189 |
updateToggleableCacheField(); |
|
190 |
} |
|
183 | 191 |
} |
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/TaxonNavigatorTest.java | ||
---|---|---|
26 | 26 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
27 | 27 |
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; |
28 | 28 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator; |
29 |
import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator.ChildHandling;
|
|
29 |
import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling; |
|
30 | 30 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
31 | 31 |
import eu.etaxonomy.cdm.model.common.Language; |
32 | 32 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
Also available in: Unified diff
fixing #5341 and colouring for cache relevant fields #4915 and #4944