Improve formatting
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 6 Jun 2008 09:07:11 +0000 (09:07 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 6 Jun 2008 09:07:11 +0000 (09:07 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1221 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

28 files changed:
org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/AbstractDeployedSystem.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DeployedSystem.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/Deployment.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/ManageableDeployedSystem.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSPath.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRelated.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/BasicTestData.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SlcTestUtils.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultListener.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultPart.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestRun.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ParentContextAware.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleParentContextAware.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java
org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java
org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java
org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestRunDescriptorDao.java
org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffIssueKey.java
org.argeo.slc.core/src/main/java/org/argeo/slc/diff/DiffNotMatched.java
org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/ApacheHttpdServer.java
org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/WebApplication.java
org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/DbUnitDeploymentData.java
org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java
org.argeo.slc.core/src/test/java/org/argeo/slc/core/structure/tree/TreeSPathTest.java

index 602e02d9f38cc0fed45f237a4ad09243070a8d3e..3941f552932ce547f0b125a3de53da6d0b39071b 100644 (file)
@@ -21,5 +21,4 @@ public abstract class AbstractDeployedSystem implements DeployedSystem {
                throw new UnsupportedException("Method not supported");
        }
 
-
 }
index 58f5a0427f9b69dca8a2e14ea77be88da4c8203b..fa383c331ce9498ed7069a9a5c6f1648f8b27903 100644 (file)
@@ -3,8 +3,7 @@ package org.argeo.slc.core.deploy;
 import org.argeo.slc.core.build.Distribution;\r
 \r
 /** An instance of a software system. */\r
-public interface DeployedSystem\r
-               extends TargetData {\r
+public interface DeployedSystem extends TargetData {\r
        public String getDeployedSystemId();\r
 \r
        public Distribution getDistribution();\r
index d59e4c14638b42e520a5c7087bb10f9a69803a1c..fede6c1b3d05122a80fb9a49cbe2f04b599dd358 100644 (file)
@@ -8,7 +8,7 @@ public interface Deployment {
        public void setTargetData(TargetData targetData);\r
 \r
        public void setDeploymentData(DeploymentData deploymentData);\r
-       \r
+\r
        public void setDistribution(Distribution distribution);\r
 \r
        public void execute();\r
index 6afee96b66bbb0337a28cbf0da8856867cff8c94..a5c0e79ba35c3d5c137f11deec2dcd1092d04d10 100644 (file)
@@ -2,5 +2,6 @@ package org.argeo.slc.core.deploy;
 
 public interface ManageableDeployedSystem extends DeployedSystem {
        public void start();
+
        public void stop();
 }
index 6fcef33c82de990dc5019ce3dc786ae34e9fbb99..2bab2e74c892812957f5c90207bbbcfed6ccc602 100644 (file)
@@ -62,7 +62,7 @@ public class SimpleSElement implements StructureElement {
        }\r
 \r
        @Override\r
-       public SimpleSElement clone(){\r
+       public SimpleSElement clone() {\r
                return new SimpleSElement(this);\r
        }\r
 \r
index a31239f83d6de4655a1da808d629bb3cda15dc27..c673faa65e063dcdf30cc0a8ca8499425347b315 100644 (file)
@@ -62,7 +62,7 @@ public class TreeSPath implements StructurePath, Comparable<StructurePath> {
        /** Gets the name part of the path. */\r
        public String getName() {\r
                int lastSep = getAsUniqueString().lastIndexOf(separator);\r
-               return getAsUniqueString().substring(lastSep+1);\r
+               return getAsUniqueString().substring(lastSep + 1);\r
        }\r
 \r
        /** Create a path without parent. */\r
index 10125678c4fb5181a402dc0e210247eae192e80a..7337367dc1de8683f4388e6cc3f75d5e22f46d5f 100644 (file)
@@ -24,7 +24,7 @@ public class TreeSRegistry implements StructureRegistry<TreeSPath> {
        private List<TreeSPath> activePaths;\r
 \r
        public <T extends StructureElement> T getElement(TreeSPath path) {\r
-               return (T)elements.get(path);\r
+               return (T) elements.get(path);\r
        }\r
 \r
        public List<StructureElement> listElements() {\r
index f939fbc12cffa7ac9e1851e6b061b9598cad244d..43a145a4ed30d5eed0b0c35a5de4145978f5894a 100644 (file)
@@ -4,8 +4,10 @@ import org.argeo.slc.core.structure.StructureAware;
 import org.argeo.slc.core.structure.StructureElement;\r
 import org.argeo.slc.core.structure.StructureRegistry;\r
 \r
-public interface TreeSRelated extends StructureAware<TreeSPath>{\r
+public interface TreeSRelated extends StructureAware<TreeSPath> {\r
        public TreeSPath getBasePath();\r
+\r
        public StructureRegistry<TreeSPath> getRegistry();\r
+\r
        public StructureElement getStructureElement(String key);\r
 }\r
index a8ee46cbf857e98f39de8e5f69037a8b05ccd72c..e6be49632b7687ffbca91f50a9bb320f0d6ef83e 100644 (file)
@@ -1,6 +1,5 @@
 package org.argeo.slc.core.test;\r
 \r
-\r
 public class BasicTestData implements TestData {\r
        private Object expected;\r
        private Object reached;\r
index c7d7840cd3541cc197e441bfec882b63d5dddc63..9eeda4064a31302772458d75296c388fdbc909db 100644 (file)
@@ -3,38 +3,32 @@ package org.argeo.slc.core.test;
 import org.argeo.slc.core.SlcException;
 
 public abstract class SlcTestUtils {
-       public static String statusToString(Integer status){
-               if(status.equals(TestStatus.PASSED)){
+       public static String statusToString(Integer status) {
+               if (status.equals(TestStatus.PASSED)) {
                        return TestStatus.STATUSSTR_PASSED;
-               }
-               else if(status.equals(TestStatus.FAILED)){
+               } else if (status.equals(TestStatus.FAILED)) {
                        return TestStatus.STATUSSTR_FAILED;
-               }
-               else if(status.equals(TestStatus.ERROR)){
+               } else if (status.equals(TestStatus.ERROR)) {
                        return TestStatus.STATUSSTR_ERROR;
-               }
-               else{
-                       throw new SlcException("Unrecognized status "+status);
+               } else {
+                       throw new SlcException("Unrecognized status " + status);
                }
        }
-       
-       public static Integer stringToStatus(String statusStr){
-               if(statusStr.equals(TestStatus.STATUSSTR_PASSED)){
+
+       public static Integer stringToStatus(String statusStr) {
+               if (statusStr.equals(TestStatus.STATUSSTR_PASSED)) {
                        return TestStatus.PASSED;
-               }
-               else if(statusStr.equals(TestStatus.STATUSSTR_FAILED)){
+               } else if (statusStr.equals(TestStatus.STATUSSTR_FAILED)) {
                        return TestStatus.FAILED;
-               }
-               else if(statusStr.equals(TestStatus.STATUSSTR_ERROR)){
+               } else if (statusStr.equals(TestStatus.STATUSSTR_ERROR)) {
                        return TestStatus.ERROR;
-               }
-               else{
-                       throw new SlcException("Unrecognized status string "+statusStr);
+               } else {
+                       throw new SlcException("Unrecognized status string " + statusStr);
                }
        }
-       
-       private SlcTestUtils(){
-               
+
+       private SlcTestUtils() {
+
        }
 
 }
index c42d783d0fe4af04284c2244512f0ef4ea19e75c..fc8f1d73fea0910ff21bc5abdb0888fadce4234e 100644 (file)
@@ -3,8 +3,7 @@ package org.argeo.slc.core.test;
 /** Listener to the operations on a test result. */\r
 public interface TestResultListener<T extends TestResult> {\r
        /** Notified when a part was added to a test result. */\r
-       public void resultPartAdded(T testResult,\r
-                       TestResultPart testResultPart);\r
+       public void resultPartAdded(T testResult, TestResultPart testResultPart);\r
 \r
        /** Stops listening and release the related resources. */\r
        public void close(T testResult);\r
index fc5749b86c491a2367e428ddc3d74d5447af1d52..9956d86249c5632c098461e09bc3cc6079f61ff3 100644 (file)
@@ -1,6 +1,5 @@
 package org.argeo.slc.core.test;\r
 \r
-\r
 /**\r
  * Part of a test result.\r
  * \r
index 5a4ac50b67f482c38148b27fea5f1466011eaaa4..17cf42394d076ab237122736fea06aadc9802a30 100644 (file)
@@ -4,7 +4,7 @@ import org.argeo.slc.core.deploy.DeployedSystem;
 import org.argeo.slc.core.process.SlcExecutionAware;\r
 \r
 /** The actual run of a test */\r
-public interface TestRun extends SlcExecutionAware{\r
+public interface TestRun extends SlcExecutionAware {\r
        /** Gets UUID */\r
        public String getUuid();\r
 \r
index a8fc8b2bed1f22ccf5634eab265c92ff4e42719f..5d13324a26935172012086d51e8d6885bbffff77 100644 (file)
@@ -4,5 +4,6 @@ import java.util.Collection;
 \r
 public interface ParentContextAware extends ContextAware {\r
        public Collection<ContextAware> getChildContexts();\r
+\r
        public void addChildContext(ContextAware contextAware);\r
 }\r
index 2dfa12346382ec99a740530f020adcadd65f41fa..76ea43f3cbbf22fc10aeaf6ca6196472b498070d 100644 (file)
@@ -24,7 +24,7 @@ public class SimpleParentContextAware extends SimpleContextAware implements
                        // If has a parent, sync it.\r
                        super.afterPropertiesSet();\r
                } else {\r
-                       if(children.size()>0){\r
+                       if (children.size() > 0) {\r
                                // No need to synchronize if no children\r
                                ContextUtils.synchronize(this);\r
                        }\r
index 328d5981a19499fa0f01ace14a849b4a87f43084..96d0db046509e4ab5e356e85e309c7097ddf0545 100644 (file)
@@ -24,7 +24,8 @@ import org.argeo.slc.core.test.TestRunAware;
  * Complex implementation of a test result compatible with a tree based\r
  * structure.\r
  */\r
-public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,Comparable<TreeTestResult> {\r
+public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,\r
+               Comparable<TreeTestResult> {\r
        private Log log = LogFactory.getLog(TreeTestResult.class);\r
 \r
        private List<TestResultListener<TreeTestResult>> listeners = new Vector<TestResultListener<TreeTestResult>>();\r
index a77eb34f0b4b5d4c6e43f0722d3c22c34240939b..6e9e496a83f52f6ba7f4dd8badf2f8aca9f432de 100644 (file)
@@ -86,7 +86,7 @@ public class FullHtmlTreeReport implements TestReport, StructureAware {
                        }\r
                        index.close();\r
                }\r
-               log.info("Generated HTML test result report to "+reportDir);\r
+               log.info("Generated HTML test result report to " + reportDir);\r
        }\r
 \r
        /**\r
index 181a9febe639e6ebc2a71866615d09ed448a033a..bc084dd0b5e3a2880cfe8d957829cd514b5a9c84 100644 (file)
@@ -6,7 +6,10 @@ import org.argeo.slc.core.process.SlcExecution;
 \r
 public interface SlcExecutionDao {\r
        public void create(SlcExecution slcExecution);\r
+\r
        public void update(SlcExecution slcExecution);\r
+\r
        public SlcExecution getSlcExecution(String uuid);\r
+\r
        public List<SlcExecution> listSlcExecutions();\r
 }\r
index f271f8cbe56b8c2f6295e17b31f550bcd9e808ab..62c9bb4449e6aa554a46da14e3b867921adb7e9a 100644 (file)
@@ -18,7 +18,7 @@ public interface TreeSRegistryDao {
 \r
        /** Updates an existing registry. */\r
        public void update(TreeSRegistry registry);\r
-       \r
+\r
        /** Sync with local registry */\r
        public void syncPath(TreeSRegistry registry,\r
                        StructureRegistry<TreeSPath> localRegistry, TreeSPath path);\r
index 01cdffd25f176305307d289bb178cb5731472264..6b72cfa7c41f60b4cd15f2623b6fe0baa3f25e35 100644 (file)
@@ -22,7 +22,6 @@ public interface TestResultDao<T extends TestResult> {
 \r
        /** Lists all test results. */\r
        public List<T> listTestResults();\r
-       \r
 \r
        public void close(String id, Date closeDate);\r
 }\r
index 7397458b5366ec6ebf079de6eb854a865a1dbafd..53bc89a3c9aa2ae4f6f3d5368d36a3ef1c283f25 100644 (file)
@@ -4,5 +4,6 @@ import org.argeo.slc.core.test.TestRunDescriptor;
 \r
 public interface TestRunDescriptorDao {\r
        public TestRunDescriptor getTestRunDescriptor(String id);\r
+\r
        public void saveOrUpdate(TestRunDescriptor testRunDescriptor);\r
 }\r
index cf00fd8eb370f553d2f5b9e7a0b6efe515883008..9894edd326cc180600299984ceb95acd9ab0d5b4 100644 (file)
@@ -5,12 +5,12 @@ public abstract class DiffIssueKey extends DiffIssue {
        /** The position of this issue. */\r
        protected DiffKey key;\r
 \r
-       /** Constructor without key*/\r
+       /** Constructor without key */\r
        public DiffIssueKey(DiffPosition position) {\r
                super(position);\r
        }\r
-       \r
-       /** Constructor with key*/\r
+\r
+       /** Constructor with key */\r
        public DiffIssueKey(DiffPosition position, DiffKey key) {\r
                super(position);\r
                this.key = key;\r
@@ -19,7 +19,7 @@ public abstract class DiffIssueKey extends DiffIssue {
        public Object getKey() {\r
                return key;\r
        }\r
-       \r
+\r
        @Override\r
        public String toString() {\r
                if (key != null) {\r
index a482548f521032f9c4089d78e3e3c5495e5f9398..4b205e98fb43162c89bf25dcd12e4de5551f22e6 100644 (file)
@@ -11,7 +11,8 @@ public class DiffNotMatched extends DiffIssueKey {
                this.reached = reached;\r
        }\r
 \r
-       public DiffNotMatched(DiffPosition position, Object expected, Object reached, DiffKey key) {\r
+       public DiffNotMatched(DiffPosition position, Object expected,\r
+                       Object reached, DiffKey key) {\r
                super(position, key);\r
                this.expected = expected;\r
                this.reached = reached;\r
@@ -27,11 +28,12 @@ public class DiffNotMatched extends DiffIssueKey {
 \r
        @Override\r
        public String toString() {\r
-               String result = position + ": not matched " + expected + " <> " + reached;\r
+               String result = position + ": not matched " + expected + " <> "\r
+                               + reached;\r
                if (super.key != null) {\r
-                        result = result + " - Key: " + super.toString();\r
+                       result = result + " - Key: " + super.toString();\r
                }\r
-               \r
+\r
                return result;\r
        }\r
 \r
index 71227bf8393a2d71f1aa73c4747ba957045c680c..ae6a3dbfa031995d17364cec40c1a68ca7b0643d 100644 (file)
@@ -18,16 +18,14 @@ public class ApacheHttpdServer implements WebServer {
                try {\r
                        return baseUrlRes.getURL();\r
                } catch (IOException e) {\r
-                       throw new SlcException("Cannot get url from "+baseUrlRes,e);\r
+                       throw new SlcException("Cannot get url from " + baseUrlRes, e);\r
                }\r
        }\r
 \r
-       public void setBaseUrlRes(Resource baseUrlRes){\r
+       public void setBaseUrlRes(Resource baseUrlRes) {\r
                this.baseUrlRes = baseUrlRes;\r
        }\r
-       \r
-       \r
-       \r
+\r
        public File getBaseLocation() {\r
                return baseLocation;\r
        }\r
index da0b1129e2c8fffa70d2d0007819c6a96b65de17..ef167ba21c5a19565a3a996984fa934c30419c3e 100644 (file)
@@ -5,7 +5,8 @@ import java.net.URL;
 \r
 import org.argeo.slc.core.deploy.DeployedSystem;\r
 \r
-public interface WebApplication extends DeployedSystem{\r
+public interface WebApplication extends DeployedSystem {\r
        public URL getBaseUrl();\r
+\r
        public File getRootLocation();\r
 }\r
index 0e3612394223f875c9312dcd17071de9bd5c61c1..3d328a0fbb4f76215096dfc42d2eb889efe7a6c9 100644 (file)
@@ -8,10 +8,10 @@ import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.xml.FlatXmlDataSet;\r
 import org.springframework.core.io.Resource;\r
 \r
-public class DbUnitDeploymentData implements DeploymentData{\r
+public class DbUnitDeploymentData implements DeploymentData {\r
        private Resource dataSetLocation;\r
 \r
-       public IDataSet createDataSet(){\r
+       public IDataSet createDataSet() {\r
                try {\r
                        InputStream in = dataSetLocation.getInputStream();\r
                        IDataSet dataSet = new FlatXmlDataSet(in);\r
@@ -22,10 +22,9 @@ public class DbUnitDeploymentData implements DeploymentData{
                }\r
 \r
        }\r
-       \r
+\r
        public void setDataSetLocation(Resource dataSetLocation) {\r
                this.dataSetLocation = dataSetLocation;\r
        }\r
-       \r
-       \r
+\r
 }\r
index 29799038fcbba072d47373095bec2a7151cd15ce..5fe1d4a67847826db000fd32ee90bbb4a3933957 100644 (file)
@@ -2,12 +2,7 @@ package org.argeo.slc.support.deploy.db;
 
 import javax.sql.DataSource;
 
-import org.argeo.slc.core.UnsupportedException;
-import org.argeo.slc.core.build.Distribution;
 import org.argeo.slc.core.deploy.AbstractDeployedSystem;
-import org.argeo.slc.core.deploy.DeployedSystem;
-import org.argeo.slc.core.deploy.DeploymentData;
-import org.argeo.slc.core.deploy.TargetData;
 
 public class SimpleJdbcDatabase extends AbstractDeployedSystem implements
                JdbcAware {
index fab6831117e85cece7e4f69391ec93d283dcf5d3..f24abc580ac6267cd1bf549df7f6114bc7f0038c 100644 (file)
@@ -18,40 +18,41 @@ public class TreeSPathTest extends TestCase {
                TreeSPath path1 = new TreeSPath("/test");\r
                TreeSPath path2 = new TreeSPath("/test");\r
                assertEquals(path1, path2);\r
-               \r
+\r
                path1 = new TreeSPath("/test/subdir/anotherdir");\r
                path2 = new TreeSPath("/test/subdir/anotherdir");\r
                assertEquals(path1, path2);\r
-               \r
+\r
                path1 = new TreeSPath("/test/subdir/anotherd");\r
                path2 = new TreeSPath("/test/subdir/anotherdir");\r
                assertNotSame(path1, path2);\r
-               \r
+\r
                path1 = new TreeSPath("/test/subdir");\r
                path2 = new TreeSPath("/test/subdir/anotherdir");\r
                assertNotSame(path1, path2);\r
-               \r
+\r
                path1 = new TreeSPath("/test/subd/anotherdir");\r
                path2 = new TreeSPath("/test/subdir/anotherdir");\r
                assertNotSame(path1, path2);\r
        }\r
-       \r
-       public void testCheckFormat(){\r
-               try{\r
+\r
+       public void testCheckFormat() {\r
+               try {\r
                        new TreeSPath("hello");\r
                        fail("Bad format should be rejected");\r
-               }catch(Exception e){\r
+               } catch (Exception e) {\r
                        // exception expected\r
                }\r
-               \r
-               try{\r
+\r
+               try {\r
                        new TreeSPath("/");\r
                        fail("Bad format should be rejected");\r
-               }catch(Exception e){\r
+               } catch (Exception e) {\r
                        // exception expected\r
                }\r
-               \r
+\r
                assertEquals(new TreeSPath("/test"), new TreeSPath("/test/"));\r
-               assertEquals(new TreeSPath("/test/dir"), new TreeSPath("//test///dir////"));\r
+               assertEquals(new TreeSPath("/test/dir"), new TreeSPath(\r
+                               "//test///dir////"));\r
        }\r
 }\r