ImportDocumentAction got rid of Database class usage. EditSimulationContextAction...

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / ImportDocumentAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
index e35e72d9e44fd80fb7ea1071d08bae0fb57acb07..e03049272e1d8f7e7b20ac8ea8ca6684e2ae01b7 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
@@ -10,13 +10,9 @@ import java.util.List;
 import java.util.ResourceBundle;
 import java.util.Vector;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.splat.dal.bo.kernel.User;
 import org.splat.manox.Reader;
 import org.splat.manox.Toolbox;
-import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.Document;
 import org.splat.dal.bo.som.ProgressState;
 import org.splat.service.DocumentService;
@@ -30,6 +26,9 @@ import org.splat.dal.bo.som.DocumentType;
 import org.splat.som.Revision;
 import org.splat.som.Step;
 
+/**
+ * Action for adding a document into a study step.
+ */
 public class ImportDocumentAction extends UploadBaseNextAction {
 
        /**
@@ -76,9 +75,6 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * @return SUCCESS in success, otherwise - ERROR
         */
        public String doInitialize() {
-               // -----------------------------
-               Session connex = Database.getCurSession();
-               Transaction transax = connex.beginTransaction();
                User user = getConnectedUser();
                File updir = getRepositoryService().getDownloadDirectory(user);
                File upfile = new File(updir.getPath() + "/" + filename);
@@ -166,7 +162,6 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                Arrays.sort(types, compare);
                doctypes = Arrays.asList(types);
 
-               transax.commit();
                return SUCCESS;
        }
 
@@ -182,8 +177,6 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                        setErrorCode("import.type");
                        return ERROR;
                }
-               Session connex = Database.getCurSession();
-               Transaction transax = connex.beginTransaction();
                try {
                        // Getting user inputs
                        mystudy = getOpenStudy();
@@ -263,7 +256,6 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                        // Converter send = ApplicationSettings.getConverter(ndoc.getType(), ndoc.getFormat());
                        //
                        // if (send != null) send.converts(addoc); // Asynchronous process
-                       transax.commit();
 
                        mystudy.add(addoc); // Updates the presentation
                        return SUCCESS;
@@ -274,14 +266,6 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                        logger.error("Reason:", error);
                        setErrorCode("internal");
                }
-               if (transax != null && transax.isActive()) { // Probably useless test
-               // Second try-catch as the rollback could fail as well
-                       try {
-                               transax.rollback();
-                       } catch (HibernateException backerror) {
-                               logger.debug("Error rolling back transaction", backerror);
-                       }
-               }
                return ERROR;
        }