Revision 562118a0
Added by Katja Luther almost 9 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java | ||
|---|---|---|
| 221 | 221 |
* @see eu.etaxonomy.cdm.api.service.INameService#delete(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator) |
| 222 | 222 |
*/ |
| 223 | 223 |
@Override |
| 224 |
public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config) {
|
|
| 225 |
return defaultService.delete(name, config); |
|
| 224 |
public DeleteResult delete(UUID nameUuid, NameDeletionConfigurator config) {
|
|
| 225 |
return defaultService.delete(nameUuid, config);
|
|
| 226 | 226 |
} |
| 227 | 227 |
|
| 228 | 228 |
/** |
| ... | ... | |
| 1164 | 1164 |
|
| 1165 | 1165 |
return defaultService.getNameRecords(); |
| 1166 | 1166 |
} |
| 1167 |
<<<<<<< HEAD |
|
| 1168 |
======= |
|
| 1169 |
|
|
| 1170 |
@Override |
|
| 1171 |
public DeleteResult delete(UUID arg0) {
|
|
| 1172 |
return defaultService.delete(arg0); |
|
| 1173 |
} |
|
| 1174 |
|
|
| 1175 |
|
|
| 1176 |
>>>>>>> b275ef1... all delete methods need an Uuid as argument |
|
| 1167 | 1177 |
|
| 1168 | 1178 |
/** |
| 1169 | 1179 |
* {@inheritDoc}
|
Also available in: Unified diff
all delete methods need an Uuid as argument
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java