Code is cleaned.

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

diff --git a/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java b/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
index 69edf20eb76effd0ec37d21ef2e534a47685a1fe..ca7baa1c7a7c3d531ee20255a0a266e29f2ca7a4 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
@@ -3,12 +3,8 @@ package org.splat.simer;
 import java.io.File;
 import java.util.Calendar;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.dal.bo.kernel.User;
-import org.splat.dal.dao.som.Database;
 import org.splat.dal.bo.som.Publication;
 import org.splat.dal.bo.som.ConvertsRelation;
 import org.splat.service.PublicationService;
@@ -64,9 +60,6 @@ public class EditDocumentAction extends DisplayStudyStepAction {
        }
 
        public String doSetDocument() {
-               // ------------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
                try {
                        mystudy = getOpenStudy();
 
@@ -78,7 +71,7 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                                getPublicationService().rename(doc, title);
                                // Useless to update the document presentation
                        } else if (todo == Execute.accept) {
-                               doc.actualize();
+                               getPublicationService().actualize(doc);
                                mystudy.update(doc);
                        } else if (todo == Execute.promote) {
                                getPublicationService().promote(doc,
@@ -100,29 +93,19 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                                mystudy.update(doc);
                                mystudy.getMenu().refreshSelectedItem(); // Updates the menu icon, in case of other documents in approved state
                        }
-                       transax.commit();
                        return SUCCESS;
                } catch (RuntimeException saverror) {
                        logger.error("Reason:", saverror);
-                       if (transax != null && transax.isActive()) {
-                               // 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;
                } catch (InvalidPropertyException error) {
-                       transax.commit();
                        return INPUT;
                }
        }
 
        public String doAttach() {
                // -------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
+//             Session connex = Database.getCurSession();
+//             Transaction transax = connex.beginTransaction();
                try {
                        // Getting user inputs
                        mystudy = getOpenStudy();
@@ -141,7 +124,7 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                        upfile.renameTo(export.getTo().asFile());
 
                        mystudy.update(edited);
-                       transax.commit();
+//                     transax.commit();
                        return SUCCESS;
                } catch (Exception error) {
                        logger.error("Reason:", error);
@@ -150,9 +133,6 @@ public class EditDocumentAction extends DisplayStudyStepAction {
        }
 
        public String doDeleteDocument() {
-               // ---------------------------------
-               Session connex = Database.getSession();
-               Transaction transax = connex.beginTransaction();
                try {
                        mystudy = getOpenStudy();
 
@@ -160,20 +140,11 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                        Publication doctag = step.getDocument(Integer.valueOf(index));
 
                        getStepService().removeDocument(step, doctag); // Updates the data structure
-                       transax.commit();
 
                        mystudy.remove(doctag); // Updates the presentation
                        return SUCCESS;
                } catch (RuntimeException saverror) {
                        logger.error("Reason:", saverror);
-                       if (transax != null && transax.isActive()) {
-                               // 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;
                }
        }