Improve formatting

git-svn-id: https://svn.argeo.org/slc/trunk@1220 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java
index bfc00edf89889f1d7947f1ebc1fb867de2e69e13..8e58fd2a4d0862d1eed92eb3a33dbcb4482c81bd 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java
@@ -7,5 +7,6 @@ public interface TestManagerService {
 \r
        public void addResultToCollection(String collectionId, String resultUuid);\r
 \r
-       public void removeResultFromCollection(String collectionId, String resultUuid);\r
+       public void removeResultFromCollection(String collectionId,\r
+                       String resultUuid);\r
 }\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
index ce14848d03f07c6ee3ea258135089950769d523a..dfb4713eaddaffb76f616958a7c82b3e3f46ed32 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
@@ -14,27 +14,23 @@ import org.argeo.slc.core.test.tree.TreeTestResult;
 public class XsltMarshallerView extends XsltView {\r
 \r
        private Marshaller marshaller;\r
-       \r
-       \r
 \r
        @Override\r
        protected Class<?>[] getSourceTypes() {\r
-               return new Class[]{TreeTestResult.class};\r
+               return new Class[] { TreeTestResult.class };\r
        }\r
 \r
        @Override\r
        protected Source convertSource(Object source) throws Exception {\r
-               Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();\r
+               Document document = DocumentBuilderFactory.newInstance()\r
+                               .newDocumentBuilder().newDocument();\r
                DOMResult result = new DOMResult(document);\r
                marshaller.marshal(source, result);\r
                return new DOMSource(result.getNode());\r
        }\r
 \r
-\r
-\r
        public void setMarshaller(Marshaller marshaller) {\r
                this.marshaller = marshaller;\r
        }\r
 \r
-       \r
 }\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
index 831a517ab5f2a0460422105eb79146e0cb6045ff..7fd5aa269a7c2ddc71ad4892f614c7dc53853b0b 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
@@ -7,7 +7,7 @@ import org.springframework.web.servlet.view.xslt.XsltViewResolver;
 public class XsltMarshallerViewResolver extends XsltViewResolver {\r
 \r
        private Marshaller marshaller;\r
-       \r
+\r
        @Override\r
        protected AbstractUrlBasedView buildView(String viewName) throws Exception {\r
                AbstractUrlBasedView viewT = super.buildView(viewName);\r
@@ -20,5 +20,4 @@ public class XsltMarshallerViewResolver extends XsltViewResolver {
                this.marshaller = marshaller;\r
        }\r
 \r
-       \r
 }\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java
index 7b1d383defbcb586a9fb29518180cde1cbc75105..8867d85ce609f5b3f017e3b9332ea715ba0ce575 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/SlcExecutionViewController.java
@@ -30,22 +30,24 @@ public class SlcExecutionViewController extends ParameterizableViewController {
                        HttpServletResponse response) throws Exception {\r
                ModelAndView modelAndView = new ModelAndView();\r
 \r
-               //List<SlcExecution> slcExecutions = slcExecutionDao.listSlcExecutions();\r
+               // List<SlcExecution> slcExecutions =\r
+               // slcExecutionDao.listSlcExecutions();\r
                String uuid = request.getParameter("uuid");\r
-               if (uuid == null) \r
+               if (uuid == null)\r
                        throw new SlcException("Parameter uuid required.");\r
-               \r
+\r
                SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid);\r
 \r
-               if (slcExecution == null) \r
-                       throw new SlcException("Could not find slc execution with uuid " + uuid +".");\r
-               \r
+               if (slcExecution == null)\r
+                       throw new SlcException("Could not find slc execution with uuid "\r
+                                       + uuid + ".");\r
+\r
                if (log.isDebugEnabled()) {\r
                        log.debug("SlcExecution " + slcExecution.getUuid());\r
                }\r
-               \r
+\r
                List<SlcExecutionStep> slcExecutionSteps = slcExecution.getSteps();\r
-               \r
+\r
                modelAndView.addObject("slcExecutionSteps", slcExecutionSteps);\r
                modelAndView.addObject("slcExecution", slcExecution);\r
                modelAndView.setViewName(getViewName());\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java
index 60db5f982a77f13fbeb558d57c901bbb8501e926..a61101a100dd4f3c80ece7dbfc62dd3bb0018f02 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java
@@ -1,30 +1,20 @@
 package org.argeo.slc.web.mvc.result;\r
 \r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
+import org.argeo.slc.services.test.TestManagerService;\r
 import org.springframework.web.servlet.ModelAndView;\r
 import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
 \r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
-import org.argeo.slc.services.test.TestManagerService;\r
-\r
 public class AddResultToCollectionController extends\r
                ParameterizableViewController {\r
        private final TestManagerService testManagerService;\r
 \r
-\r
        public AddResultToCollectionController(TestManagerService testManagerService) {\r
                this.testManagerService = testManagerService;\r
        }\r
 \r
-\r
        @Override\r
        protected ModelAndView handleRequestInternal(HttpServletRequest request,\r
                        HttpServletResponse response) throws Exception {\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
index 1ed3ca3e065f82046c500daa2ad6609d9fc38a96..1ab784e1fdb6ba6477d8b6287d2da23ee700fc8c 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
@@ -1,20 +1,12 @@
 package org.argeo.slc.web.mvc.result;\r
 \r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
+import org.argeo.slc.services.test.TestManagerService;\r
 import org.springframework.web.servlet.ModelAndView;\r
 import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
 \r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
-import org.argeo.slc.services.test.TestManagerService;\r
-\r
 public class RemoveResultFromCollectionController extends\r
                ParameterizableViewController {\r
        private final TestManagerService testManagerService;\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java
index 33d048617e6635a0e16e59e1d0fc2ba1a1055360..6867062f20c9b3618f11fb5f8e339b6c6c0ec7df 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java
@@ -23,11 +23,11 @@ public class ResultCollectionListController extends
                ModelAndView modelAndView = new ModelAndView();\r
 \r
                // no need to retrieve since collection list is always in session\r
-               \r
-//             SortedSet<TreeTestResultCollection> results = testResultCollectionDao\r
-//                             .listCollections();\r
-//             modelAndView.addObject("resultCollections", results);\r
-               \r
+\r
+               // SortedSet<TreeTestResultCollection> results = testResultCollectionDao\r
+               // .listCollections();\r
+               // modelAndView.addObject("resultCollections", results);\r
+\r
                modelAndView.setViewName(getViewName());\r
                return modelAndView;\r
        }\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java
index 7d1b038ff8016aff2384515fa22d7c11594ecfde..52950fdae0090174eb48594904714420d0c33ce3 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionViewController.java
@@ -1,18 +1,12 @@
 package org.argeo.slc.web.mvc.result;\r
 \r
-import java.util.SortedSet;\r
-import java.util.TreeSet;\r
-\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import org.springframework.web.servlet.ModelAndView;\r
-import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
-\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
+import org.springframework.web.servlet.ModelAndView;\r
+import org.springframework.web.servlet.mvc.ParameterizableViewController;\r
 \r
 public class ResultCollectionViewController extends\r
                ParameterizableViewController {\r

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
index 36cf45a68f4dc3668d6dac3b35076e928a4b68d9..56532d4ca3e35daa03025659e73948879d0ea7ce 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java
@@ -36,10 +36,12 @@ public class SlcExecutionStepsRequestEp extends
                                throw new SlcException("Could not find slc execution " + uuid);
 
                        List<SlcExecutionStep> additionalSteps = msg.getSteps();
-                       if(log.isTraceEnabled()){
-                               log.trace("Trying to add additional steps to slc execution "+uuid+":");
-                               for(SlcExecutionStep step: additionalSteps){
-                                       log.trace("Step "+step.getUuid()+" (in slc execution "+uuid+")");
+                       if (log.isTraceEnabled()) {
+                               log.trace("Trying to add additional steps to slc execution "
+                                               + uuid + ":");
+                               for (SlcExecutionStep step : additionalSteps) {
+                                       log.trace("Step " + step.getUuid() + " (in slc execution "
+                                                       + uuid + ")");
                                }
                        }
                        slcExecution.getSteps().addAll(additionalSteps);

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java
index 8b8bd860a6107f9ec68b42123c6cf1bccb0b42a5..a0fac48811aac6153a4257bbefbe72316ac6d6b9 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java
@@ -22,7 +22,7 @@ public class CloseTreeTestResultRequestEp extends
        @Override
        protected Object invokeInternal(Object requestObject) throws Exception {
                CloseTreeTestResultRequest msg = (CloseTreeTestResultRequest) requestObject;
-               
+
                if (log.isDebugEnabled())
                        log.debug("Closing result with id " + msg.getResultUuid()
                                        + " at date " + msg.getCloseDate());

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
index 5ef459866aff2a022dce122bef6ee7118e41417e..cdf77f592814756e94735d144b9c046f8a60fc30 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
@@ -1,25 +1,14 @@
 package org.argeo.slc.ws.test.tree;
 
-import javax.swing.plaf.basic.BasicTreeUI.TreeTraverseAction;
-
-import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.test.TestRunDescriptor;
 import org.argeo.slc.core.test.tree.PartSubList;
 import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.core.test.tree.TreeTestResultCollection;
-import org.argeo.slc.dao.process.SlcExecutionDao;
-import org.argeo.slc.dao.test.TestRunDescriptorDao;
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.services.test.TestManagerService;
-import org.argeo.slc.services.test.impl.TestManagerServiceImpl;
+import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
 
 public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint {