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 hb...@apache.org on 2011/02/19 16:47:37 UTC
svn commit: r1072362 -
/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
Author: hboutemy
Date: Sat Feb 19 15:47:37 2011
New Revision: 1072362
URL: http://svn.apache.org/viewvc?rev=1072362&view=rev
Log:
fixed code formatting
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.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/URIPathDescriptor.java?rev=1072362&r1=1072361&r2=1072362&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java Sat Feb 19 15:47:37 2011
@@ -199,22 +199,19 @@ public class URIPathDescriptor
*/
public boolean sameSite( final URI uri )
{
- if ( uri == null )
- {
- return false;
- }
-
- return sameSite( this.baseURI, uri );
+ return ( uri != null ) && sameSite( this.baseURI, uri );
}
private static boolean sameSite( final URI baseURI, final URI newBaseURI )
- {final boolean equalScheme = ( newBaseURI.getScheme() == null ? false
- : baseURI.getScheme().equalsIgnoreCase( newBaseURI.getScheme() ) );
- final boolean equalHost = ( baseURI.getHost() == null ? newBaseURI.getHost() == null
- : baseURI.getHost().equalsIgnoreCase( newBaseURI.getHost() ) );
- final boolean equalPort = ( baseURI.getPort() == newBaseURI.getPort() );
+ {
+ final boolean sameScheme =
+ ( newBaseURI.getScheme() == null ? false : baseURI.getScheme().equalsIgnoreCase( newBaseURI.getScheme() ) );
+ final boolean sameHost =
+ ( baseURI.getHost() == null ? newBaseURI.getHost() == null
+ : baseURI.getHost().equalsIgnoreCase( newBaseURI.getHost() ) );
+ final boolean samePort = ( baseURI.getPort() == newBaseURI.getPort() );
- return ( equalScheme && equalPort && equalHost );
+ return ( sameScheme && samePort && sameHost );
}
/**