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 e8f2157e883b7f468c0e0a40b360ecdaf9def7c9..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
@@ -1,14 +1,22 @@
 package eu.etaxonomy.taxeditor.session;
 
 import java.util.Collection;
-import java.util.Set;
 
+import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 
 public interface ICdmEntitySessionManager {
 
     public abstract ICdmEntitySession newSession(ICdmEntitySessionEnabled sessionOwner, boolean setAsActive);
 
+    /**
+     * @param sessionOwner
+     * @return
+     */
+    public ICdmEntitySession bindNullSession();
+
+
        public abstract void bind(ICdmEntitySessionEnabled sessionOwner);
 
 
@@ -18,6 +26,11 @@ public interface ICdmEntitySessionManager {
        public abstract <T extends CdmBase> T load(T cdmBase, boolean update);
 
 
+       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);
 
 
@@ -45,16 +58,22 @@ public interface ICdmEntitySessionManager {
      */
     public void disposeAll();
 
-    /**
-     * @param cdmBase
-     * @param affectedObjects
-     */
-    public <T extends CdmBase> void update(T cdmBase, Set<CdmBase> affectedObjects);
 
     /**
      *
      */
     public <T extends CdmBase> void update();
 
+    /**
+     * @param sessionOwner
+     * @return
+     */
+    public boolean contains(ICdmEntitySessionEnabled sessionOwner);
+
+    /**
+     * @return
+     */
+    public ICdmEntitySession getNullSession();
+
 
-}
\ No newline at end of file
+}