Fix:

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

diff --git a/Workspace/Siman/src/org/splat/simer/CompareStudyAction.java b/Workspace/Siman/src/org/splat/simer/CompareStudyAction.java
index 62934b3785fe8df11ab9b6ee7824d7d6570b1098..7dd91ecb77f4889efff2a7935184df5f001c014e 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/CompareStudyAction.java
+++ b/Workspace/Siman/src/org/splat/simer/CompareStudyAction.java
@@ -20,6 +20,7 @@ import org.splat.exception.IncompatibleDataException;
 import org.splat.exception.InvalidParameterException;
 import org.splat.kernel.MismatchException;
 import org.splat.service.PublicationService;
+import org.splat.service.StudyComparisonService;
 import org.splat.service.dto.DocToCompareDTO;
 import org.splat.service.dto.StudyFacadeDTO;
 import org.splat.wapp.Constants;
@@ -66,6 +67,11 @@ public class CompareStudyAction extends DisplayStudyStepAction {
         */
        private PublicationService _publicationService;
 
+       /**
+        * Injected study comparison service.
+        */
+       private StudyComparisonService _studyComparisonService;
+
        /**
         * If true, "incompatible data" message will be displayed..
         */
@@ -80,7 +86,7 @@ public class CompareStudyAction extends DisplayStudyStepAction {
                initializationScreenContext(Constants.STUDY_MENU, Constants.BACK);
                getTitleBarSettings().setEditDisabledProperty(Constants.TRUE);
                String res = SUCCESS;
-               _studyList = getStudyService().getComparableStudies(getOpenStudy().getUser().getIndex());
+               _studyList = getStudyComparisonService().getComparableStudies(getOpenStudy().getUser().getIndex());
                return res;
        }
 
@@ -99,7 +105,7 @@ public class CompareStudyAction extends DisplayStudyStepAction {
                                for(Long id : _documentsToCompareIds) {
                                        docsList.add(_publicationService.getDocToCompareDTO(id.longValue()));
                                }
-                               String resultPath = getStudyService().compare(docsList, getConnectedUser().getUsername());
+                               String resultPath = getStudyComparisonService().compare(docsList, getConnectedUser().getUsername());
                                File file = new File(resultPath);
                                _resultInputStream = new FileInputStream(file);
                                res = SUCCESS;
@@ -221,4 +227,21 @@ public class CompareStudyAction extends DisplayStudyStepAction {
        public void setErrorMessage(final Boolean errorMessage) {
                _errorMessage = errorMessage;
        }
+
+       /**
+        * Get the studyComparisonService.
+        * @return the studyComparisonService
+        */
+       public StudyComparisonService getStudyComparisonService() {
+               return _studyComparisonService;
+       }
+
+       /**
+        * Set the studyComparisonService.
+        * @param studyComparisonService the studyComparisonService to set
+        */
+       public void setStudyComparisonService(
+                       final StudyComparisonService studyComparisonService) {
+               _studyComparisonService = studyComparisonService;
+       }
 }