From b2cf21e88b831c137803a47585115352de2a1b41 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 6 Jun 2008 09:06:57 +0000 Subject: [PATCH] Improve formatting git-svn-id: https://svn.argeo.org/slc/trunk@1220 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/services/test/TestManagerService.java | 3 ++- .../argeo/slc/web/mvc/XsltMarshallerView.java | 10 +++------- .../web/mvc/XsltMarshallerViewResolver.java | 3 +-- .../process/SlcExecutionViewController.java | 18 ++++++++++-------- .../AddResultToCollectionController.java | 12 +----------- .../RemoveResultFromCollectionController.java | 10 +--------- .../result/ResultCollectionListController.java | 10 +++++----- .../result/ResultCollectionViewController.java | 10 ++-------- .../ws/process/SlcExecutionStepsRequestEp.java | 10 ++++++---- .../tree/CloseTreeTestResultRequestEp.java | 2 +- .../slc/ws/test/tree/ResultPartRequestEp.java | 13 +------------ 11 files changed, 33 insertions(+), 68 deletions(-) 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 bfc00edf8..8e58fd2a4 100644 --- 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 { public void addResultToCollection(String collectionId, String resultUuid); - public void removeResultFromCollection(String collectionId, String resultUuid); + public void removeResultFromCollection(String collectionId, + String resultUuid); } 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 ce14848d0..dfb4713ea 100644 --- 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 { private Marshaller marshaller; - - @Override protected Class[] getSourceTypes() { - return new Class[]{TreeTestResult.class}; + return new Class[] { TreeTestResult.class }; } @Override protected Source convertSource(Object source) throws Exception { - Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + Document document = DocumentBuilderFactory.newInstance() + .newDocumentBuilder().newDocument(); DOMResult result = new DOMResult(document); marshaller.marshal(source, result); return new DOMSource(result.getNode()); } - - public void setMarshaller(Marshaller marshaller) { this.marshaller = marshaller; } - } 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 831a517ab..7fd5aa269 100644 --- 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 { private Marshaller marshaller; - + @Override protected AbstractUrlBasedView buildView(String viewName) throws Exception { AbstractUrlBasedView viewT = super.buildView(viewName); @@ -20,5 +20,4 @@ public class XsltMarshallerViewResolver extends XsltViewResolver { this.marshaller = marshaller; } - } 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 7b1d383de..8867d85ce 100644 --- 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 { ModelAndView modelAndView = new ModelAndView(); - //List slcExecutions = slcExecutionDao.listSlcExecutions(); + // List slcExecutions = + // slcExecutionDao.listSlcExecutions(); String uuid = request.getParameter("uuid"); - if (uuid == null) + if (uuid == null) throw new SlcException("Parameter uuid required."); - + SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid); - if (slcExecution == null) - throw new SlcException("Could not find slc execution with uuid " + uuid +"."); - + if (slcExecution == null) + throw new SlcException("Could not find slc execution with uuid " + + uuid + "."); + if (log.isDebugEnabled()) { log.debug("SlcExecution " + slcExecution.getUuid()); } - + List slcExecutionSteps = slcExecution.getSteps(); - + modelAndView.addObject("slcExecutionSteps", slcExecutionSteps); modelAndView.addObject("slcExecution", slcExecution); modelAndView.setViewName(getViewName()); 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 60db5f982..a61101a10 100644 --- 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; -import java.util.SortedSet; -import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.slc.services.test.TestManagerService; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.ParameterizableViewController; -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.core.test.tree.TreeTestResultCollection; -import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.services.test.TestManagerService; - public class AddResultToCollectionController extends ParameterizableViewController { private final TestManagerService testManagerService; - public AddResultToCollectionController(TestManagerService testManagerService) { this.testManagerService = testManagerService; } - @Override protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception { 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 1ed3ca3e0..1ab784e1f 100644 --- 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; -import java.util.SortedSet; -import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.slc.services.test.TestManagerService; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.ParameterizableViewController; -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.core.test.tree.TreeTestResultCollection; -import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.services.test.TestManagerService; - public class RemoveResultFromCollectionController extends ParameterizableViewController { private final TestManagerService testManagerService; 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 33d048617..6867062f2 100644 --- 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(); // no need to retrieve since collection list is always in session - -// SortedSet results = testResultCollectionDao -// .listCollections(); -// modelAndView.addObject("resultCollections", results); - + + // SortedSet results = testResultCollectionDao + // .listCollections(); + // modelAndView.addObject("resultCollections", results); + modelAndView.setViewName(getViewName()); return modelAndView; } 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 7d1b038ff..52950fdae 100644 --- 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; -import java.util.SortedSet; -import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.ParameterizableViewController; public class ResultCollectionViewController extends ParameterizableViewController { 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 36cf45a68..56532d4ca 100644 --- 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 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 8b8bd860a..a0fac4881 100644 --- 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 5ef459866..cdf77f592 100644 --- 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 { -- 2.39.2