Improve formatting

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

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
index e81fb30eb42b69e84b2fdcdd66807395d88c78e1..1646fbccd0a919b9932859723408743a4f88ad2b 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntRegistryUtil.java
@@ -113,7 +113,7 @@ public class AntRegistryUtil {
                        p.executeTarget(target != null ? target : p.getDefaultTarget());\r
                } catch (Throwable e) {\r
                        exception = e;\r
-                       log.error("Exception when running Ant: ",e);\r
+                       log.error("Exception when running Ant: ", e);\r
                } finally {\r
                        p.fireBuildFinished(exception);\r
                }\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/BasicSlcProjectHelper.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/BasicSlcProjectHelper.java
index 620acdfcb1d16f04e2122864a9adbd5eeed21f70..73e1c46a73ad56d89ccf2e3fcfdef5c217050624 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/BasicSlcProjectHelper.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/BasicSlcProjectHelper.java
@@ -19,15 +19,15 @@ public class BasicSlcProjectHelper extends ProjectHelper2 {
        public void parse(Project project, Object source) throws BuildException {\r
                TreeSRegistry registry = new TreeSRegistry();\r
                TreeSPath projectPath = TreeSPath.parseToCreatePath(projectRootPath);\r
-               \r
+\r
                // FIXME\r
                registry.register(projectPath, new SimpleSElement("ROOT"));\r
-               \r
+\r
                project.addReference(SlcProjectHelper.REF_STRUCTURE_REGISTRY, registry);\r
                project.addReference(SlcProjectHelper.REF_PROJECT_PATH, projectPath);\r
 \r
                super.parse(project, source);\r
-               \r
+\r
                project.addReference(SlcProjectHelper.REF_ROOT_CONTEXT, context);\r
                SlcProjectHelper.createAndRegisterSlcExecution(project);\r
 \r
@@ -38,6 +38,4 @@ public class BasicSlcProjectHelper extends ProjectHelper2 {
                this.context = context;\r
        }\r
 \r
-       \r
-       \r
 }\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/ProjectRelatedBuildListener.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/ProjectRelatedBuildListener.java
index 6d047d5d019fd2e3feeca0b88afaddd1397c2a42..48c8394c6df9b0c8deb22ca3dad86ab112911c69 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/ProjectRelatedBuildListener.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/ProjectRelatedBuildListener.java
@@ -5,7 +5,7 @@ import org.apache.tools.ant.Project;
 \r
 public interface ProjectRelatedBuildListener extends BuildListener {\r
        public Project getProject();\r
-       \r
-       /** SlcExecution must already have been registered in project*/\r
+\r
+       /** SlcExecution must already have been registered in project */\r
        public void init(Project project);\r
 }\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index a68f210262fceda4464e36d5c8660c8c730f130a..d92a5f8920ceab76be1d70c7976ab146a8eed18b 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -162,8 +162,8 @@ public class SlcAntConfig {
                        String key = o.toString();\r
                        // System.out.println(key+"="+all.getProperty(key));\r
                        if (project.getUserProperty(key) == null) {// not already set\r
-                       // if (log.isDebugEnabled())\r
-                       // log.debug(key + "=" + all.getProperty(key));\r
+                               // if (log.isDebugEnabled())\r
+                               // log.debug(key + "=" + all.getProperty(key));\r
                                project.setUserProperty(key, all.getProperty(key));\r
                        }\r
                }\r
@@ -246,8 +246,7 @@ public class SlcAntConfig {
                        }\r
                        // Default test run\r
                        if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) {\r
-                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY,\r
-                                               "defaultTestRun");\r
+                               all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun");\r
                        }\r
 \r
                        // Default log4j\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
index fb073014cf38c4f8d897557ee8f4ba22ed997030..cd85f89c7373b5efcd7220b8d4a34b30efcd9eed 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
@@ -37,8 +37,8 @@ public class SpringArg<T> extends DataType {
         */\r
        public T getBeanInstance() {\r
                if (beanInstance == null) {\r
-                       beanInstance = (T)getContext().getBean(bean);\r
-                       \r
+                       beanInstance = (T) getContext().getBean(bean);\r
+\r
                        setOverridenProperties(beanInstance);\r
 \r
                        // FIXME: why are we doing this? Could not find any object using it\r
@@ -52,8 +52,8 @@ public class SpringArg<T> extends DataType {
                }\r
                return beanInstance;\r
        }\r
-       \r
-       protected void setOverridenProperties(Object obj){\r
+\r
+       protected void setOverridenProperties(Object obj) {\r
                BeanWrapper wrapper = new BeanWrapperImpl(obj);\r
                for (OverrideArg override : overrides) {\r
                        if (override.getName() == null) {\r
@@ -61,12 +61,11 @@ public class SpringArg<T> extends DataType {
                                                "The name of the property to override has to be set.");\r
                        }\r
 \r
-//                     LogFactory.getLog(getClass()).debug(\r
-//                                     "Prop " + override.getName());\r
-                       wrapper.setPropertyValue(override.getName(), override\r
-                                       .getObject());\r
+                       // LogFactory.getLog(getClass()).debug(\r
+                       // "Prop " + override.getName());\r
+                       wrapper.setPropertyValue(override.getName(), override.getObject());\r
                }\r
-       \r
+\r
        }\r
 \r
        /** Creates an override subtag. */\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
index 9c4dd89a355ec382cc53e3d1f8a3788ff46be033..830c13ae3cfeb0f8fffcfb66d32d718786401165 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
@@ -110,11 +110,10 @@ public abstract class SAwareTask extends AbstractSpringTask {
        /** Actions to be executed by the implementor. */\r
        protected abstract void executeActions(String mode);\r
 \r
-       \r
-       public <T> T getBean(String beanName){\r
-               return (T)getContext().getBean(beanName);\r
+       public <T> T getBean(String beanName) {\r
+               return (T) getContext().getBean(beanName);\r
        }\r
-       \r
+\r
        /** Create a reference to an external structure element. */\r
        public StructureElementArg createStructureElement() {\r
                if (structureElementArg != null)\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
index d10b073e1e972f9574b8aff3884efbf479b46168..ebe06ea82807eb94969cf26c5c452557239d7a9a 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
@@ -39,7 +39,7 @@ public class MavenDeployEnvironment implements DeployEnvironment {
                }
 
                try {
-                       File tempDir = new File("/tmp/"+UUID.randomUUID().toString());
+                       File tempDir = new File("/tmp/" + UUID.randomUUID().toString());
                        tempDir.mkdirs();
                        targetLocation.mkdirs();
                        Properties props = new Properties();

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/ValidatingClientInterceptor.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/ValidatingClientInterceptor.java
index cd3add67c5c00a5f189fc05b52c806a58644c0db..05861d94059ec3398dca19dbb8b4080925064d11 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/ValidatingClientInterceptor.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/ValidatingClientInterceptor.java
@@ -49,7 +49,7 @@ public class ValidatingClientInterceptor implements ClientInterceptor {
                if (validateResponse) {\r
                        if (messageContext.getResponse() == null)\r
                                return true;\r
-                       \r
+\r
                        Source source = messageContext.getResponse().getPayloadSource();\r
                        try {\r
                                return validate(source);\r

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/WebServiceUtils.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/WebServiceUtils.java
index d37a27efea7bdd27347c5e6c68a2c968e8f2f26c..a7aaea1352f23841a7b0d162dfc824ead216a684 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/WebServiceUtils.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ws/client/WebServiceUtils.java
@@ -24,16 +24,16 @@ public abstract class WebServiceUtils {
                        Object resp = marshalSendAndReceive(template, req);\r
                        return resp;\r
                } catch (Exception e) {\r
-                       log.error("Cannot send web servicerequest: "+e.getMessage());\r
-                       if(log.isDebugEnabled()){\r
-                               log.debug("Webservice exception details: ",e);\r
+                       log.error("Cannot send web servicerequest: " + e.getMessage());\r
+                       if (log.isDebugEnabled()) {\r
+                               log.debug("Webservice exception details: ", e);\r
                        }\r
                        return null;\r
                }\r
        }\r
 \r
-       public static Object marshalSendAndReceive(\r
-                       WebServiceTemplate template, Object req) {\r
+       public static Object marshalSendAndReceive(WebServiceTemplate template,\r
+                       Object req) {\r
                if (log.isTraceEnabled()) {\r
                        try {\r
                                StringResult result = new StringResult();\r