ref #6190 removing svn property place holder in first line of code - java files

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / taxeditor / session / ICdmEntitySessionManager.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
index 27e23a02f87ee80b1374fca377bd079f29be4ac7..2b890d239f155eb60a63f3db28a03603ba2f8eef 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java
@@ -4,6 +4,7 @@ import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 
 public interface ICdmEntitySessionManager {
 
@@ -13,7 +14,7 @@ public interface ICdmEntitySessionManager {
      * @param sessionOwner
      * @return
      */
-    public ICdmEntitySession bindNullSession(ICdmEntitySessionEnabled sessionOwner);
+    public ICdmEntitySession bindNullSession();
 
 
        public abstract void bind(ICdmEntitySessionEnabled sessionOwner);
@@ -27,6 +28,8 @@ public interface ICdmEntitySessionManager {
 
        public abstract UpdateResult load(UpdateResult updateResult, boolean update);
 
+       public abstract MergeResult load(MergeResult mergeResult, boolean update);
+
 
        public abstract <T extends CdmBase> Collection<T> load(Collection<T> cdmBaseList, boolean update);
 
@@ -72,4 +75,5 @@ public interface ICdmEntitySessionManager {
      */
     public ICdmEntitySession getNullSession();
 
-}
\ No newline at end of file
+
+}