Revision 562118a0
Added by Katja Luther almost 9 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java | ||
|---|---|---|
| 710 | 710 |
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths); |
| 711 | 711 |
} |
| 712 | 712 |
|
| 713 |
<<<<<<< HEAD |
|
| 713 | 714 |
/** |
| 714 | 715 |
* {@inheritDoc}
|
| 715 | 716 |
*/ |
| ... | ... | |
| 717 | 718 |
public DeleteResult delete(UUID arg0) {
|
| 718 | 719 |
return defaultService.delete(arg0); |
| 719 | 720 |
} |
| 721 |
======= |
|
| 722 |
@Override |
|
| 723 |
public DeleteResult delete(UUID arg0) {
|
|
| 724 |
return defaultService.delete(arg0); |
|
| 725 |
} |
|
| 726 |
>>>>>>> b275ef1... all delete methods need an Uuid as argument |
|
| 720 | 727 |
|
| 721 | 728 |
} |
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