Revision 562118a0
Added by Katja Luther almost 9 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java | ||
|---|---|---|
| 1115 | 1115 |
return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber); |
| 1116 | 1116 |
} |
| 1117 | 1117 |
|
| 1118 |
<<<<<<< HEAD |
|
| 1118 | 1119 |
/** |
| 1119 | 1120 |
* {@inheritDoc}
|
| 1120 | 1121 |
*/ |
| ... | ... | |
| 1162 | 1163 |
public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
|
| 1163 | 1164 |
return defaultService.moveTaxonDescriptions(arg0, arg1); |
| 1164 | 1165 |
} |
| 1166 |
======= |
|
| 1167 |
@Override |
|
| 1168 |
public DeleteResult delete(UUID arg0) {
|
|
| 1169 |
return defaultService.delete(arg0); |
|
| 1170 |
} |
|
| 1171 |
>>>>>>> b275ef1... all delete methods need an Uuid as argument |
|
| 1165 | 1172 |
} |
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