maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r736602 - in /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src: main/java/org/apache/maven/doxia/site/decoration/inheritance/ test/java/org/apache/maven/doxia/site/decoration/inheritance/
Date Thu, 22 Jan 2009 10:45:41 GMT
Author: vsiveton
Date: Thu Jan 22 02:45:40 2009
New Revision: 736602

URL: http://svn.apache.org/viewvc?rev=736602&view=rev
Log:
o codestyle and javadoc, no code change

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java
    maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java?rev=736602&r1=736601&r2=736602&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
Thu Jan 22 02:45:40 2009
@@ -25,25 +25,24 @@
  * Manage inheritance of the decoration model.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
  */
 public interface DecorationModelInheritanceAssembler
 {
-    /**
-     * Plexus lookup role.
-     */
+    /** Plexus lookup role. */
     String ROLE = DecorationModelInheritanceAssembler.class.getName();
 
     /**
      * Manage inheritance of the decoration model between a parent and child.
      *
-     * @param name a name.
-     * @param child the child DecorationModel.
-     * @param parent the parent DecorationModel.
-     * @param childBaseUrl the child nase URL.
+     * @param name a name, used for breadcrumb.
+     * @param child the child DecorationModel to be merged with parent.
+     * @param parent the parent DecorationModel not null.
+     * @param childBaseUrl the child base URL.
      * @param parentBaseUrl the parent base URL.
      */
-    void assembleModelInheritance( String name, DecorationModel child, DecorationModel parent,
String childBaseUrl,
-                                   String parentBaseUrl );
+    void assembleModelInheritance( String name, DecorationModel child, DecorationModel parent,
+                                   String childBaseUrl, String parentBaseUrl );
 
     /**
      * Resolve relative paths for a DecorationModel given a base URL.

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java?rev=736602&r1=736601&r2=736602&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java
Thu Jan 22 02:45:40 2009
@@ -1,7 +1,5 @@
 package org.apache.maven.doxia.site.decoration.inheritance;
 
-import junit.framework.TestCase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,17 +19,20 @@
  * under the License.
  */
 
+import junit.framework.TestCase;
+
 /**
  * Testcase for DOXIA-91 problems. All tests make sure that a passed in null will not generate
any path conversion but
  * just returns the old path.
- * 
+ *
  * @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
+ * @version $Id$
  */
-
-public class Doxia91Test extends TestCase
+public class Doxia91Test
+    extends TestCase
 {
-
-    public void testOldPathNull() throws Exception
+    public void testOldPathNull()
+        throws Exception
     {
         PathDescriptor oldPath = new PathDescriptor( null );
         PathDescriptor newPath = new PathDescriptor( "http://www.apache.org/" );
@@ -41,7 +42,8 @@
         assertEquals( diff, oldPath );
     }
 
-    public void testNewPathNull() throws Exception
+    public void testNewPathNull()
+        throws Exception
     {
         PathDescriptor oldPath = new PathDescriptor( "http://www.apache.org/", "file:///home/henning/foo"
);
         PathDescriptor newPath = new PathDescriptor( null );
@@ -51,7 +53,8 @@
         assertEquals( diff, oldPath );
     }
 
-    public void testBothPathNull() throws Exception
+    public void testBothPathNull()
+        throws Exception
     {
         PathDescriptor oldPath = new PathDescriptor( null );
         PathDescriptor newPath = new PathDescriptor( null );

Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java?rev=736602&r1=736601&r2=736602&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java
Thu Jan 22 02:45:40 2009
@@ -30,10 +30,13 @@
  * Test the PathDescriptor creation under various circumstances.
  *
  * @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
+ * @version $Id$
  */
-public class PathDescriptorTest extends TestCase
+public class PathDescriptorTest
+    extends TestCase
 {
-    public void testAbsPath() throws Exception
+    public void testAbsPath()
+        throws Exception
     {
         String path = "absolutePath";
 
@@ -49,7 +52,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testRelPath() throws Exception
+    public void testRelPath()
+        throws Exception
     {
         String path = "relativePath";
 
@@ -65,7 +69,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testEmptyAbsPath() throws Exception
+    public void testEmptyAbsPath()
+        throws Exception
     {
         String path = "";
 
@@ -81,7 +86,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testEmptyRelPath() throws Exception
+    public void testEmptyRelPath()
+        throws Exception
     {
         String path = "";
 
@@ -97,7 +103,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullPath() throws Exception
+    public void testNullPath()
+        throws Exception
     {
         String path = null;
 
@@ -113,7 +120,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullBaseAbsPath() throws Exception
+    public void testNullBaseAbsPath()
+        throws Exception
     {
         String base = null;
         String path = "absolutePath";
@@ -130,7 +138,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullBaseRelPath() throws Exception
+    public void testNullBaseRelPath()
+        throws Exception
     {
         String base = null;
         String path = "relativePath";
@@ -147,7 +156,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullBaseEmptyAbsPath() throws Exception
+    public void testNullBaseEmptyAbsPath()
+        throws Exception
     {
         String base = null;
         String path = "";
@@ -164,7 +174,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullBaseEmptyRelPath() throws Exception
+    public void testNullBaseEmptyRelPath()
+        throws Exception
     {
         String base = null;
         String path = "";
@@ -181,7 +192,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testNullBaseNullPath() throws Exception
+    public void testNullBaseNullPath()
+        throws Exception
     {
         String base = null;
         String path = null;
@@ -198,7 +210,8 @@
         assertEquals( "wrong location", path, desc.getLocation() );
     }
 
-    public void testUrlBaseAbsPath() throws Exception
+    public void testUrlBaseAbsPath()
+        throws Exception
     {
         String base = "http://maven.apache.org/";
         String path = "absolutePath";
@@ -215,7 +228,8 @@
         assertEquals( "wrong location", base + path, desc.getLocation() );
     }
 
-    public void testUrlBaseRelPath() throws Exception
+    public void testUrlBaseRelPath()
+        throws Exception
     {
         String base = "http://maven.apache.org/";
         String path = "relativePath";
@@ -232,7 +246,8 @@
         assertEquals( "wrong location", base + path, desc.getLocation() );
     }
 
-    public void testUrlBaseEmptyAbsPath() throws Exception
+    public void testUrlBaseEmptyAbsPath()
+        throws Exception
     {
         String base = "http://maven.apache.org/";
         String path = "";
@@ -249,7 +264,8 @@
         assertEquals( "wrong location", base + path, desc.getLocation() );
     }
 
-    public void testUrlBaseEmptyRelPath() throws Exception
+    public void testUrlBaseEmptyRelPath()
+        throws Exception
     {
         String base = "http://maven.apache.org/";
         String path = "";
@@ -266,7 +282,8 @@
         assertEquals( "wrong location", base + path, desc.getLocation() );
     }
 
-    public void testUrlBaseNullPath() throws Exception
+    public void testUrlBaseNullPath()
+        throws Exception
     {
         String base = "http://maven.apache.org/";
         String path = null;
@@ -283,7 +300,8 @@
         assertEquals( "wrong location", base, desc.getLocation() );
     }
 
-    public void testFileBaseAbsPath() throws Exception
+    public void testFileBaseAbsPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "absolutePath";
@@ -309,7 +327,8 @@
         }
     }
 
-    public void testFileBaseRelPath() throws Exception
+    public void testFileBaseRelPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "relativePath";
@@ -335,7 +354,8 @@
         }
     }
 
-    public void testFileBaseEmptyAbsPath() throws Exception
+    public void testFileBaseEmptyAbsPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "";
@@ -361,7 +381,8 @@
         }
     }
 
-    public void testFileBaseEmptyRelPath() throws Exception
+    public void testFileBaseEmptyRelPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "";
@@ -387,7 +408,8 @@
         }
     }
 
-    public void testFileBaseNullPath() throws Exception
+    public void testFileBaseNullPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = null;
@@ -404,7 +426,8 @@
         assertEquals( "wrong location", base, desc.getLocation() );
     }
 
-    public void testPathBaseAbsPath() throws Exception
+    public void testPathBaseAbsPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "absolutePath";
@@ -430,7 +453,8 @@
         }
     }
 
-    public void testPathBaseRelPath() throws Exception
+    public void testPathBaseRelPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "relativePath";
@@ -456,7 +480,8 @@
         }
     }
 
-    public void testPathBaseEmptyAbsPath() throws Exception
+    public void testPathBaseEmptyAbsPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "";
@@ -482,7 +507,8 @@
         }
     }
 
-    public void testPathBaseEmptyRelPath() throws Exception
+    public void testPathBaseEmptyRelPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = "";
@@ -508,7 +534,8 @@
         }
     }
 
-    public void testPathBaseNullPath() throws Exception
+    public void testPathBaseNullPath()
+        throws Exception
     {
         String base = "/tmp/foo";
         String path = null;



Mime
View raw message