You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by de...@apache.org on 2009/01/26 01:10:32 UTC
svn commit: r737616 - in
/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./
doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java
Author: dennisl
Date: Mon Jan 26 00:10:32 2009
New Revision: 737616
URL: http://svn.apache.org/viewvc?rev=737616&view=rev
Log:
o Merge r732668 from trunk.
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed)
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java
Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 00:10:32 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,733390,736602-736603,736628-736630,736929
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,733390,736602-736603,736628-736630,736929
Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java?rev=737616&r1=737615&r2=737616&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java (original)
+++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java Mon Jan 26 00:10:32 2009
@@ -33,9 +33,12 @@
*/
public abstract class PathUtils
{
+ /**
+ * Private constructor.
+ */
private PathUtils()
{
- // nop
+ // do not instantiate
}
/**
@@ -102,7 +105,7 @@
&& ( newUrl.getHost().equalsIgnoreCase( oldUrl.getHost() ) )
&& ( newUrl.getPort() == oldUrl.getPort() ) )
{
- // Both pathes point to the same site. So we can use relative pathes.
+ // Both paths point to the same site. So we can use relative paths.
String oldPath = oldPathDescriptor.getPath();
String newPath = newPathDescriptor.getPath();