Revision 903b5970
Added by Patrick Plitzner about 5 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermDtoContentProvider.java | ||
|---|---|---|
| 65 | 65 |
return vocabularyDto; |
| 66 | 66 |
} |
| 67 | 67 |
//parent is the vocabulary |
| 68 |
return new TermVocabularyDto(termDto.getVocabularyUuid(), null); |
|
| 68 |
return new TermVocabularyDto(termDto.getVocabularyUuid(), null, termDto.getTermType());
|
|
| 69 | 69 |
} |
| 70 | 70 |
return null; |
| 71 | 71 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermEditorE4.java | ||
|---|---|---|
| 215 | 215 |
} |
| 216 | 216 |
else if(element instanceof TermVocabulary){
|
| 217 | 217 |
TermVocabulary vocabulary = (TermVocabulary)element; |
| 218 |
TermVocabularyDto vocabularyDto = new TermVocabularyDto(vocabulary.getUuid(), vocabulary.getRepresentations()); |
|
| 218 |
TermVocabularyDto vocabularyDto = new TermVocabularyDto(vocabulary.getUuid(), vocabulary.getRepresentations(), vocabulary.getTermType());
|
|
| 219 | 219 |
viewer.update(vocabularyDto, null); |
| 220 | 220 |
changedTerms.add(vocabulary); |
| 221 | 221 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java | ||
|---|---|---|
| 71 | 71 |
//FIXME: implement creation of term vocabularies |
| 72 | 72 |
// definedEditorInput.getVocabularies().add(termVocabulary); |
| 73 | 73 |
|
| 74 |
return postExecute(new TermVocabularyDto(termVocabulary.getUuid(), termVocabulary.getRepresentations())); |
|
| 74 |
return postExecute(new TermVocabularyDto(termVocabulary.getUuid(), termVocabulary.getRepresentations(), termVocabulary.getTermType()));
|
|
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 | 77 |
@Override |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java | ||
|---|---|---|
| 122 | 122 |
IVocabularyService vocabularyService = CdmStore.getService(IVocabularyService.class); |
| 123 | 123 |
TermVocabulary termVocabulary = vocabularyService.load(uuid); |
| 124 | 124 |
if (termVocabulary != null){
|
| 125 |
termlist.add(new TermVocabularyDto(uuid, termVocabulary.getRepresentations())); |
|
| 125 |
termlist.add(new TermVocabularyDto(uuid, termVocabulary.getRepresentations(), termVocabulary.getTermType()));
|
|
| 126 | 126 |
} |
| 127 | 127 |
} |
| 128 | 128 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java | ||
|---|---|---|
| 21 | 21 |
import org.eclipse.swt.widgets.Composite; |
| 22 | 22 |
|
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 24 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 24 | 25 |
import eu.etaxonomy.cdm.model.term.TermType; |
| 25 | 26 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
| 26 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
|
| 27 | 27 |
import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto; |
| 28 | 28 |
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto; |
| 29 | 29 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| ... | ... | |
| 130 | 130 |
} |
| 131 | 131 |
List<TermVocabulary> tempVocs = CdmStore.getService(IVocabularyService.class).find(uuidVocs); |
| 132 | 132 |
for (TermVocabulary voc: tempVocs){
|
| 133 |
vocs.add(new TermVocabularyDto(voc.getUuid(), voc.getRepresentations())); |
|
| 133 |
vocs.add(new TermVocabularyDto(voc.getUuid(), voc.getRepresentations(), voc.getTermType()));
|
|
| 134 | 134 |
} |
| 135 | 135 |
|
| 136 | 136 |
} |
Also available in: Unified diff
Adapt to model change (set termType in constructor)