From: Mathieu Baudier Date: Fri, 6 Jun 2008 09:07:23 +0000 (+0000) Subject: Improve formatting X-Git-Tag: argeo-slc-2.1.7~2818 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f2781535c07af51281b59fd0e3b6a362f29c5e10;p=gpl%2Fargeo-slc.git 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 e81fb30eb..1646fbccd 100644 --- 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()); } catch (Throwable e) { exception = e; - log.error("Exception when running Ant: ",e); + log.error("Exception when running Ant: ", e); } finally { p.fireBuildFinished(exception); } 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 620acdfcb..73e1c46a7 100644 --- 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 { TreeSRegistry registry = new TreeSRegistry(); TreeSPath projectPath = TreeSPath.parseToCreatePath(projectRootPath); - + // FIXME registry.register(projectPath, new SimpleSElement("ROOT")); - + project.addReference(SlcProjectHelper.REF_STRUCTURE_REGISTRY, registry); project.addReference(SlcProjectHelper.REF_PROJECT_PATH, projectPath); super.parse(project, source); - + project.addReference(SlcProjectHelper.REF_ROOT_CONTEXT, context); SlcProjectHelper.createAndRegisterSlcExecution(project); @@ -38,6 +38,4 @@ public class BasicSlcProjectHelper extends ProjectHelper2 { this.context = context; } - - } 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 6d047d5d0..48c8394c6 100644 --- 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; public interface ProjectRelatedBuildListener extends BuildListener { public Project getProject(); - - /** SlcExecution must already have been registered in project*/ + + /** SlcExecution must already have been registered in project */ public void init(Project project); } 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 a68f21026..d92a5f892 100644 --- 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(); // System.out.println(key+"="+all.getProperty(key)); if (project.getUserProperty(key) == null) {// not already set - // if (log.isDebugEnabled()) - // log.debug(key + "=" + all.getProperty(key)); + // if (log.isDebugEnabled()) + // log.debug(key + "=" + all.getProperty(key)); project.setUserProperty(key, all.getProperty(key)); } } @@ -246,8 +246,7 @@ public class SlcAntConfig { } // Default test run if (all.getProperty(DEFAULT_TEST_RUN_PROPERTY) == null) { - all.setProperty(DEFAULT_TEST_RUN_PROPERTY, - "defaultTestRun"); + all.setProperty(DEFAULT_TEST_RUN_PROPERTY, "defaultTestRun"); } // Default log4j 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 fb073014c..cd85f89c7 100644 --- 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 extends DataType { */ public T getBeanInstance() { if (beanInstance == null) { - beanInstance = (T)getContext().getBean(bean); - + beanInstance = (T) getContext().getBean(bean); + setOverridenProperties(beanInstance); // FIXME: why are we doing this? Could not find any object using it @@ -52,8 +52,8 @@ public class SpringArg extends DataType { } return beanInstance; } - - protected void setOverridenProperties(Object obj){ + + protected void setOverridenProperties(Object obj) { BeanWrapper wrapper = new BeanWrapperImpl(obj); for (OverrideArg override : overrides) { if (override.getName() == null) { @@ -61,12 +61,11 @@ public class SpringArg extends DataType { "The name of the property to override has to be set."); } -// LogFactory.getLog(getClass()).debug( -// "Prop " + override.getName()); - wrapper.setPropertyValue(override.getName(), override - .getObject()); + // LogFactory.getLog(getClass()).debug( + // "Prop " + override.getName()); + wrapper.setPropertyValue(override.getName(), override.getObject()); } - + } /** Creates an override subtag. */ 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 9c4dd89a3..830c13ae3 100644 --- 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. */ protected abstract void executeActions(String mode); - - public T getBean(String beanName){ - return (T)getContext().getBean(beanName); + public T getBean(String beanName) { + return (T) getContext().getBean(beanName); } - + /** Create a reference to an external structure element. */ public StructureElementArg createStructureElement() { if (structureElementArg != null) 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 d10b073e1..ebe06ea82 100644 --- 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 cd3add67c..05861d940 100644 --- 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) { if (messageContext.getResponse() == null) return true; - + Source source = messageContext.getResponse().getPayloadSource(); try { return validate(source); 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 d37a27efe..a7aaea135 100644 --- 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); return resp; } catch (Exception e) { - log.error("Cannot send web servicerequest: "+e.getMessage()); - if(log.isDebugEnabled()){ - log.debug("Webservice exception details: ",e); + log.error("Cannot send web servicerequest: " + e.getMessage()); + if (log.isDebugEnabled()) { + log.debug("Webservice exception details: ", e); } return null; } } - public static Object marshalSendAndReceive( - WebServiceTemplate template, Object req) { + public static Object marshalSendAndReceive(WebServiceTemplate template, + Object req) { if (log.isTraceEnabled()) { try { StringResult result = new StringResult();