BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update transient services for new load method
[taxeditor.git]
/
eu.etaxonomy.taxeditor.editor
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
editor
/
view
/
dataimport
/
transientServices
/
TransientReferenceService.java
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index 4e9f29d564a09eaa3520e98db6fbc6ad6a968543..606139a39322ae1bbebe8c8360df649a1e9440e6 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@
-40,6
+40,7
@@
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.model.view.AuditEvent;
import eu.etaxonomy.cdm.model.view.AuditEventRecord;
import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort;
import eu.etaxonomy.cdm.model.view.AuditEvent;
import eu.etaxonomy.cdm.model.view.AuditEventRecord;
import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort;
+import eu.etaxonomy.cdm.persistence.dto.MergeResult;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.cdm.persistence.query.Grouping;
import eu.etaxonomy.cdm.persistence.query.MatchMode;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.cdm.persistence.query.Grouping;
import eu.etaxonomy.cdm.persistence.query.MatchMode;
@@
-734,11
+735,29
@@
public class TransientReferenceService implements IReferenceService {
return defaultService.merge(arg0);
}
return defaultService.merge(arg0);
}
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
+ */
+ @Override
+ public List<MergeResult<Reference>> merge(List<Reference> arg0, boolean arg1) {
+ return defaultService.merge(arg0, arg1);
+ }
+
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
*/
@Override
/* (non-Javadoc)
* @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
*/
@Override
- public
Reference
merge(Reference arg0, boolean arg1) {
+ public
MergeResult<Reference>
merge(Reference arg0, boolean arg1) {
return defaultService.merge(arg0, arg1);
}
return defaultService.merge(arg0, arg1);
}
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.service.IService#loadWithUpdate(java.util.UUID)
+ */
+ @Override
+ public Reference loadWithUpdate(UUID arg0) {
+ return defaultService.loadWithUpdate(arg0);
+ }
+
+
}
}