You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2006/08/30 13:10:40 UTC
svn commit: r438461 - in /maven/maven-1/core/trunk/src:
bootstrap/org/apache/maven/ java/org/apache/maven/
java/org/apache/maven/cli/ java/org/apache/maven/jelly/
java/org/apache/maven/jelly/tags/maven/
java/org/apache/maven/jelly/tags/werkz/ java/org/...
Author: aheritier
Date: Wed Aug 30 04:10:37 2006
New Revision: 438461
URL: http://svn.apache.org/viewvc?rev=438461&view=rev
Log:
standardize code format
Modified:
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Base64.java
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Dependency.java
maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/HttpUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyBuildListener.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenExpressionFactory.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/DefaultArtifactFactory.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/Base64.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLFormatter.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLPathTool.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/jelly/ProjectTag.java
Modified: maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java (original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/ArtifactDownloader.java Wed Aug 30 04:10:37 2006
@@ -106,7 +106,7 @@
directory.mkdirs();
}
- if ( destinationFile.exists() && file.indexOf( SNAPSHOT_SIGNATURE ) < 0 )
+ if ( destinationFile.exists() && ( file.indexOf( SNAPSHOT_SIGNATURE ) < 0 ) )
{
continue;
}
Modified: maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Base64.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Base64.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Base64.java (original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Base64.java Wed Aug 30 04:10:37 2006
@@ -120,7 +120,7 @@
// LOG.debug( "second character = " + encoded[1] );
// }
- if ( inLastSegment && padding > 1 )
+ if ( inLastSegment && ( padding > 1 ) )
{
encoded[2] = '=';
}
@@ -133,7 +133,7 @@
// LOG.debug( "third character = " + encoded[2] );
// }
- if ( inLastSegment && padding > 0 )
+ if ( inLastSegment && ( padding > 0 ) )
{
encoded[3] = '=';
}
@@ -283,15 +283,15 @@
private static char toBase64Char( int input )
{
- if ( input > -1 && input < 26 )
+ if ( ( input > -1 ) && ( input < 26 ) )
{
return (char) ( 'A' + input );
}
- else if ( input > 25 && input < 52 )
+ else if ( ( input > 25 ) && ( input < 52 ) )
{
return (char) ( 'a' + input - 26 );
}
- else if ( input > 51 && input < 62 )
+ else if ( ( input > 51 ) && ( input < 62 ) )
{
return (char) ( '0' + input - 52 );
}
@@ -311,15 +311,15 @@
private static int toBase64Int( char input )
{
- if ( input >= 'A' && input <= 'Z' )
+ if ( ( input >= 'A' ) && ( input <= 'Z' ) )
{
return input - 'A';
}
- else if ( input >= 'a' && input <= 'z' )
+ else if ( ( input >= 'a' ) && ( input <= 'z' ) )
{
return input + 26 - 'a';
}
- else if ( input >= '0' && input <= '9' )
+ else if ( ( input >= '0' ) && ( input <= '9' ) )
{
return input + 52 - '0';
}
@@ -348,7 +348,7 @@
for ( int i = 0; i < data.length(); i++ )
{
char c = data.charAt( i );
- if ( c != '\r' && c != '\n' )
+ if ( ( c != '\r' ) && ( c != '\n' ) )
{
buffer.append( c );
}
Modified: maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java (original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/BootstrapTask.java Wed Aug 30 04:10:37 2006
@@ -447,7 +447,7 @@
*/
private boolean validProperty( String property )
{
- if ( property != null && property.length() > 0 && !property.startsWith( "${" ) )
+ if ( ( property != null ) && ( property.length() > 0 ) && !property.startsWith( "${" ) )
{
return true;
}
Modified: maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Dependency.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Dependency.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Dependency.java (original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/Dependency.java Wed Aug 30 04:10:37 2006
@@ -275,7 +275,7 @@
*/
protected boolean isValid( String value )
{
- if ( value != null && !"".equals( value.trim() ) )
+ if ( ( value != null ) && !"".equals( value.trim() ) )
{
return true;
}
Modified: maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/HttpUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/HttpUtils.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/HttpUtils.java (original)
+++ maven/maven-1/core/trunk/src/bootstrap/org/apache/maven/HttpUtils.java Wed Aug 30 04:10:37 2006
@@ -55,7 +55,7 @@
public static void useProxyUser( final String proxyHost, final String proxyPort, final String proxyUserName,
final String proxyPassword )
{
- if ( proxyHost != null && proxyPort != null )
+ if ( ( proxyHost != null ) && ( proxyPort != null ) )
{
System.getProperties().put( "proxySet", "true" );
System.getProperties().put( "proxyHost", proxyHost );
@@ -203,7 +203,7 @@
connection.setIfModifiedSince( timestamp );
}
// prepare Java 1.1 style credentials
- if ( username != null || password != null )
+ if ( ( username != null ) || ( password != null ) )
{
String up = username + ":" + password;
String encoding = Base64.encode( up.getBytes(), false );
@@ -264,7 +264,7 @@
throw isException;
}
- if ( connection.getLastModified() <= timestamp && connection.getLastModified() != 0 )
+ if ( ( connection.getLastModified() <= timestamp ) && ( connection.getLastModified() != 0 ) )
{
return;
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/MavenUtils.java Wed Aug 30 04:10:37 2006
@@ -219,7 +219,7 @@
// 3)
String pomToExtend = project.getExtend();
- if ( pomToExtend != null && useParentPom )
+ if ( ( pomToExtend != null ) && useParentPom )
{
// We must look in the <extend/> element for expressions that may be present as
//
@@ -437,12 +437,12 @@
{
Map result = new HashMap();
- if ( dominantMap == null && recessiveMap == null )
+ if ( ( dominantMap == null ) && ( recessiveMap == null ) )
{
return null;
}
- if ( dominantMap != null && recessiveMap == null )
+ if ( ( dominantMap != null ) && ( recessiveMap == null ) )
{
return dominantMap;
}
@@ -940,7 +940,7 @@
}
ClassLoader parent = classLoader.getParent();
- if ( parent != null && parent instanceof ForeheadClassLoader )
+ if ( ( parent != null ) && ( parent instanceof ForeheadClassLoader ) )
{
log.info( "Displaying Parent classloader: " );
displayClassLoaderContents( (ForeheadClassLoader) classLoader.getParent() );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/cli/App.java Wed Aug 30 04:10:37 2006
@@ -741,7 +741,7 @@
if ( plugin != null )
{
Project project = mavenSession.getPluginProjectFromGoal( plugin );
- if ( project != null && project.getDescription() != null )
+ if ( ( project != null ) && ( project.getDescription() != null ) )
{
log.info( wrapConsoleMessage( project.getDescription(), 0, CONSOLE_WIDTH ) );
}
@@ -805,7 +805,7 @@
log.info( "" );
Project rootProject = mavenSession.getRootProject();
- if ( rootProject.getBuild() != null && rootProject.getBuild().getDefaultGoal() != null )
+ if ( ( rootProject.getBuild() != null ) && ( rootProject.getBuild().getDefaultGoal() != null ) )
{
String defaultGoal = rootProject.getBuild().getDefaultGoal();
String msg = MavenUtils.getMessage( "displayGoals.defaultGoal" ) + defaultGoal;
@@ -1273,7 +1273,7 @@
*/
protected String wrapConsoleMessage( String msg, int wrapIndent, int lineWidth )
{
- if ( msg.indexOf( '\n' ) < 0 && msg.indexOf( '\r' ) < 0 )
+ if ( ( msg.indexOf( '\n' ) < 0 ) && ( msg.indexOf( '\r' ) < 0 ) )
{
return wrapConsoleLine( msg, wrapIndent, lineWidth );
}
@@ -1333,7 +1333,7 @@
buf.append( LS );
//pad with spaces to create indent
- for ( int i = 0; i != wrapIndent && i < lineWidth; i++ )
+ for ( int i = 0; ( i != wrapIndent ) && ( i < lineWidth ); i++ )
{
buf.append( pad );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyBuildListener.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyBuildListener.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyBuildListener.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyBuildListener.java Wed Aug 30 04:10:37 2006
@@ -84,7 +84,7 @@
public void messageLogged( BuildEvent event )
{
- if ( event.getPriority() > Project.MSG_INFO && !isDebug() )
+ if ( ( event.getPriority() > Project.MSG_INFO ) && !isDebug() )
{
return;
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java Wed Aug 30 04:10:37 2006
@@ -117,7 +117,7 @@
public static void runScript( File scriptFile, URL rootUrl, JellyContext context, XMLOutput output )
throws Exception
{
- if ( !scriptFile.canRead() || scriptFile.length() < 1 )
+ if ( !scriptFile.canRead() || ( scriptFile.length() < 1 ) )
{
return;
}
@@ -276,7 +276,9 @@
source.setSystemId( systemId );
}
if ( log.isDebugEnabled() )
+ {
log.debug( "the system identifier to help resolve relative URLs : " + systemId );
+ }
script = parser.parse( source );
script = script.compile();
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenExpressionFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenExpressionFactory.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenExpressionFactory.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenExpressionFactory.java Wed Aug 30 04:10:37 2006
@@ -143,7 +143,7 @@
{
char ch = chars[i];
// could maybe be a bit more restrictive...
- if ( Character.isWhitespace( ch ) || ch == '[' )
+ if ( Character.isWhitespace( ch ) || ( ch == '[' ) )
{
return false;
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/MavenJellyContext.java Wed Aug 30 04:10:37 2006
@@ -711,7 +711,7 @@
String value = (String) getVariable( var );
File f = new File( value );
- if ( f.getParentFile() != null && !f.getParentFile().exists() )
+ if ( ( f.getParentFile() != null ) && !f.getParentFile().exists() )
{
f.getParentFile().mkdirs();
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java Wed Aug 30 04:10:37 2006
@@ -54,7 +54,7 @@
public void doTag( XMLOutput output )
throws MissingAttributeException, JellyTagException
{
- if ( resources == null || todir == null )
+ if ( ( resources == null ) || ( todir == null ) )
{
log.warn( "resources or todir was null" );
return;
@@ -105,7 +105,7 @@
{
StringBuffer targetDirectoryBuffer = new StringBuffer( todir );
String targetPath = resource.getTargetPath();
- if ( targetPath != null && !"".equals( targetPath.trim() ) )
+ if ( ( targetPath != null ) && !"".equals( targetPath.trim() ) )
{
targetDirectoryBuffer.append( '/' ).append( targetPath );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java Wed Aug 30 04:10:37 2006
@@ -42,7 +42,7 @@
public void doTag( XMLOutput output )
throws JellyTagException
{
- if ( value == null || "".equals( value.trim() ) )
+ if ( ( value == null ) || "".equals( value.trim() ) )
{
if ( fail )
{
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java Wed Aug 30 04:10:37 2006
@@ -308,7 +308,7 @@
{
checkAttribute( getBasedir(), "basedir" );
- if ( getGlob() == null && getIncludes() == null && projectList == null )
+ if ( ( getGlob() == null ) && ( getIncludes() == null ) && ( projectList == null ) )
{
throw new MissingAttributeException( "glob|includes|projectList" );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/werkz/MavenGoalTag.java Wed Aug 30 04:10:37 2006
@@ -64,7 +64,7 @@
{
Goal goal = getProject().getGoal( getName() );
- if ( goal == null || goal.getAction() == null )
+ if ( ( goal == null ) || ( goal.getAction() == null ) )
{
super.doTag( output );
goal = getProject().getGoal( getName() );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java Wed Aug 30 04:10:37 2006
@@ -314,7 +314,7 @@
{
goal = (Goal) stack.removeFirst();
- if ( goal == null || chain.contains( goal ) )
+ if ( ( goal == null ) || chain.contains( goal ) )
{
continue;
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java Wed Aug 30 04:10:37 2006
@@ -264,7 +264,7 @@
setUserPluginsDir( new File( mavenSession.getRootContext().getUserPluginsDir() ) );
if ( !getPluginsDir().isDirectory()
- || ( getPluginsDir().listFiles() != null && getPluginsDir().listFiles().length == 0 ) )
+ || ( ( getPluginsDir().listFiles() != null ) && ( getPluginsDir().listFiles().length == 0 ) ) )
{
throw new MavenException( "Maven was badly installed. Please reinstall it." );
}
@@ -447,7 +447,7 @@
public void processDependencies( Project project )
throws MalformedURLException, Exception
{
- if ( project.getArtifacts() == null || project.getArtifacts().isEmpty() )
+ if ( ( project.getArtifacts() == null ) || project.getArtifacts().isEmpty() )
{
log.debug( "No dependencies to process for project " + project.getName() );
return;
@@ -628,7 +628,7 @@
// Default goal handling - if goals are null, don't even process the default
String defaultGoalName = transientMapper.getDefaultGoalName();
- if ( project.getBuild() != null && project.getBuild().getDefaultGoal() != null )
+ if ( ( project.getBuild() != null ) && ( project.getBuild().getDefaultGoal() != null ) )
{
defaultGoalName = project.getBuild().getDefaultGoal();
}
@@ -640,7 +640,7 @@
defaultGoalName = e.evaluateAsString( baseContext );
baseContext.setVariable( MavenConstants.DEFAULT_GOAL, defaultGoalName );
- if ( goals != null && goals.size() == 0 )
+ if ( ( goals != null ) && ( goals.size() == 0 ) )
{
log.debug( "Using default goal: " + defaultGoalName );
goals.add( defaultGoalName );
@@ -704,7 +704,7 @@
try
{
Goal goal = werkzProject.getGoal( goalName );
- if ( goal == null || goal.getAction() == null )
+ if ( ( goal == null ) || ( goal.getAction() == null ) )
{
throw new NoSuchGoalException( goalName );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Wed Aug 30 04:10:37 2006
@@ -142,7 +142,7 @@
public File getMavenXml()
{
// The getFile() is needed because interpolation calls this before the file is set
- if ( mavenXml == null && getFile() != null )
+ if ( ( mavenXml == null ) && ( getFile() != null ) )
{
mavenXml = new File( getFile().getParentFile(), MavenConstants.BUILD_FILE_NAME );
}
@@ -176,7 +176,7 @@
public String getId()
{
// The id has already been set.
- if ( model.getId() != null && model.getId().indexOf( ":" ) > 0 )
+ if ( ( model.getId() != null ) && ( model.getId().indexOf( ":" ) > 0 ) )
{
return model.getId();
}
@@ -577,7 +577,7 @@
log.debug( "Verifying dependencies for " + getId() );
// Only attempt to verify the dependencies if a project.xml file exists, and it is fully-fledged (not an uninitialized parent project).
- if ( getFile() != null && getFile().exists() && initialized )
+ if ( ( getFile() != null ) && getFile().exists() && initialized )
{
getDependencyVerifier().verify();
}
@@ -846,36 +846,36 @@
}
// The following replaces the list merges
- if ( getMailingLists() == null || getMailingLists().isEmpty() )
+ if ( ( getMailingLists() == null ) || getMailingLists().isEmpty() )
{
setMailingLists( parent.getMailingLists() );
}
- if ( getContributors() == null || getContributors().isEmpty() )
+ if ( ( getContributors() == null ) || getContributors().isEmpty() )
{
setContributors( parent.getContributors() );
}
- if ( getDevelopers() == null || getDevelopers().isEmpty() )
+ if ( ( getDevelopers() == null ) || getDevelopers().isEmpty() )
{
setDevelopers( parent.getDevelopers() );
}
- if ( getVersions() == null || getVersions().isEmpty() )
+ if ( ( getVersions() == null ) || getVersions().isEmpty() )
{
model.setVersions( parent.getVersions() );
resolveVersions();
}
- if ( getLicenses() == null || getLicenses().isEmpty() )
+ if ( ( getLicenses() == null ) || getLicenses().isEmpty() )
{
setLicenses( parent.getLicenses() );
}
- if ( getBranches() == null || getBranches().isEmpty() )
+ if ( ( getBranches() == null ) || getBranches().isEmpty() )
{
setBranches( parent.getBranches() );
}
- if ( getReports() == null || getReports().isEmpty() )
+ if ( ( getReports() == null ) || getReports().isEmpty() )
{
setReports( parent.getReports() );
}
- if ( getPackageGroups() == null || getPackageGroups().isEmpty() )
+ if ( ( getPackageGroups() == null ) || getPackageGroups().isEmpty() )
{
setPackageGroups( parent.getPackageGroups() );
}
@@ -919,24 +919,24 @@
}
}
- if ( build.getSourceDirectory() != null && build.getSourceDirectory().length() > 0 )
+ if ( ( build.getSourceDirectory() != null ) && ( build.getSourceDirectory().length() > 0 ) )
{
build.setSourceDirectory( MavenUtils.makeAbsolutePath( basedir, build.getSourceDirectory() ) );
}
- if ( build.getAspectSourceDirectory() != null && build.getAspectSourceDirectory().length() > 0 )
+ if ( ( build.getAspectSourceDirectory() != null ) && ( build.getAspectSourceDirectory().length() > 0 ) )
{
build.setAspectSourceDirectory( MavenUtils.makeAbsolutePath( basedir, build.getAspectSourceDirectory() ) );
}
- if ( build.getUnitTestSourceDirectory() != null && build.getUnitTestSourceDirectory().length() > 0 )
+ if ( ( build.getUnitTestSourceDirectory() != null ) && ( build.getUnitTestSourceDirectory().length() > 0 ) )
{
build
.setUnitTestSourceDirectory( MavenUtils.makeAbsolutePath( basedir, build.getUnitTestSourceDirectory() ) );
}
- if ( build.getIntegrationUnitTestSourceDirectory() != null
- && build.getIntegrationUnitTestSourceDirectory().length() > 0 )
+ if ( ( build.getIntegrationUnitTestSourceDirectory() != null )
+ && ( build.getIntegrationUnitTestSourceDirectory().length() > 0 ) )
{
build.setIntegrationUnitTestSourceDirectory( MavenUtils.makeAbsolutePath( basedir, build
.getIntegrationUnitTestSourceDirectory() ) );
@@ -986,11 +986,11 @@
child.setNagEmailAddress( parent.getNagEmailAddress() );
}
- if ( child.getResources() == null || child.getResources().isEmpty() )
+ if ( ( child.getResources() == null ) || child.getResources().isEmpty() )
{
child.setResources( parent.getResources() );
}
- if ( child.getSourceModifications() == null || child.getSourceModifications().isEmpty() )
+ if ( ( child.getSourceModifications() == null ) || child.getSourceModifications().isEmpty() )
{
child.setSourceModifications( parent.getSourceModifications() );
}
@@ -1013,15 +1013,15 @@
}
// The following replaces the list merges
- if ( child.getResources() == null || child.getResources().isEmpty() )
+ if ( ( child.getResources() == null ) || child.getResources().isEmpty() )
{
child.setResources( parent.getResources() );
}
- if ( child.getIncludes() == null || child.getIncludes().isEmpty() )
+ if ( ( child.getIncludes() == null ) || child.getIncludes().isEmpty() )
{
child.setIncludes( parent.getIncludes() );
}
- if ( child.getExcludes() == null || child.getExcludes().isEmpty() )
+ if ( ( child.getExcludes() == null ) || child.getExcludes().isEmpty() )
{
child.setExcludes( parent.getExcludes() );
}
@@ -1411,7 +1411,7 @@
originalGroupId = model.getGroupId();
if ( model.getId() != null )
{
- if ( model.getGroupId() == null && model.getArtifactId() == null)
+ if ( ( model.getGroupId() == null ) && ( model.getArtifactId() == null ))
{
setId( model.getId() );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java Wed Aug 30 04:10:37 2006
@@ -129,8 +129,8 @@
{
if ( getDependency().getVersion() != null )
{
- return getDependency().getVersion().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0
- || getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0;
+ return ( getDependency().getVersion().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0 )
+ || ( getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0 );
}
else
{
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/repository/DefaultArtifactFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/repository/DefaultArtifactFactory.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/repository/DefaultArtifactFactory.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/repository/DefaultArtifactFactory.java Wed Aug 30 04:10:37 2006
@@ -44,7 +44,7 @@
{
//!! I certainly have to revisit this. As sometimes we get
// any of the following conditions satisfied.
- if ( dependency.getType() == null || dependency.getType().trim().length() == 0
+ if ( ( dependency.getType() == null ) || ( dependency.getType().trim().length() == 0 )
|| "jar".equals( dependency.getType() ) || "test".equals( dependency.getType() ) )
{
dependency.setType( "jar" );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/Base64.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/Base64.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/Base64.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/Base64.java Wed Aug 30 04:10:37 2006
@@ -125,7 +125,7 @@
// LOG.debug( "second character = " + encoded[1] );
// }
- if ( inLastSegment && padding > 1 )
+ if ( inLastSegment && ( padding > 1 ) )
{
encoded[2] = '=';
}
@@ -138,7 +138,7 @@
// LOG.debug( "third character = " + encoded[2] );
// }
- if ( inLastSegment && padding > 0 )
+ if ( inLastSegment && ( padding > 0 ) )
{
encoded[3] = '=';
}
@@ -288,15 +288,15 @@
private static char toBase64Char( int input )
{
- if ( input > -1 && input < 26 )
+ if ( ( input > -1 ) && ( input < 26 ) )
{
return (char) ( 'A' + input );
}
- else if ( input > 25 && input < 52 )
+ else if ( ( input > 25 ) && ( input < 52 ) )
{
return (char) ( 'a' + input - 26 );
}
- else if ( input > 51 && input < 62 )
+ else if ( ( input > 51 ) && ( input < 62 ) )
{
return (char) ( '0' + input - 52 );
}
@@ -316,15 +316,15 @@
private static int toBase64Int( char input )
{
- if ( input >= 'A' && input <= 'Z' )
+ if ( ( input >= 'A' ) && ( input <= 'Z' ) )
{
return input - 'A';
}
- else if ( input >= 'a' && input <= 'z' )
+ else if ( ( input >= 'a' ) && ( input <= 'z' ) )
{
return input + 26 - 'a';
}
- else if ( input >= '0' && input <= '9' )
+ else if ( ( input >= '0' ) && ( input <= '9' ) )
{
return input + 52 - '0';
}
@@ -353,7 +353,7 @@
for ( int i = 0; i < data.length(); i++ )
{
char c = data.charAt( i );
- if ( c != '\r' && c != '\n' )
+ if ( ( c != '\r' ) && ( c != '\n' ) )
{
buffer.append( c );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/CaseInsensitiveGlobPatternMapper.java Wed Aug 30 04:10:37 2006
@@ -40,7 +40,7 @@
*/
public String[] mapFileName( String sourceFileName )
{
- if ( fromPrefix == null || !sourceFileName.toLowerCase().startsWith( fromPrefix.toLowerCase() )
+ if ( ( fromPrefix == null ) || !sourceFileName.toLowerCase().startsWith( fromPrefix.toLowerCase() )
|| !sourceFileName.toLowerCase().endsWith( fromPostfix.toLowerCase() ) )
{
return null;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLFormatter.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLFormatter.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLFormatter.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLFormatter.java Wed Aug 30 04:10:37 2006
@@ -60,7 +60,7 @@
public static final String formatNumber( final String value, final String pattern )
{
log.debug( "value = '" + value + "', pattern = '" + pattern + "'" );
- if ( pattern == null || value == null )
+ if ( ( pattern == null ) || ( value == null ) )
{
return "<error formatting: '" + value + "' with '" + pattern + "'>";
}
@@ -80,7 +80,7 @@
valueAsNumber = new Double( "0.00" );
}
- if ( pattern.indexOf( "." ) != -1 || pattern.indexOf( "%" ) != -1 )
+ if ( ( pattern.indexOf( "." ) != -1 ) || ( pattern.indexOf( "%" ) != -1 ) )
{
// parse as a decimal
ret = formatter.format( valueAsNumber.doubleValue() );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLPathTool.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLPathTool.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLPathTool.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/DVSLPathTool.java Wed Aug 30 04:10:37 2006
@@ -61,7 +61,7 @@
* Verify the arguments and make sure the filename is relative
* to the base directory.
*/
- if ( basedir == null || basedir.length() == 0 || filename == null || filename.length() == 0
+ if ( ( basedir == null ) || ( basedir.length() == 0 ) || ( filename == null ) || ( filename.length() == 0 )
|| !filename.startsWith( basedir ) )
{
return "";
@@ -107,7 +107,7 @@
{
filename = uppercaseDrive( filename );
- if ( filename == null || filename.length() == 0 )
+ if ( ( filename == null ) || ( filename.length() == 0 ) )
{
return "";
}
@@ -144,7 +144,7 @@
*/
public static final String getDirectoryComponent( String filename )
{
- if ( filename == null || filename.length() == 0 )
+ if ( ( filename == null ) || ( filename.length() == 0 ) )
{
return "";
}
@@ -238,7 +238,7 @@
{
return null;
}
- if ( path.length() >= 2 && path.charAt( 1 ) == ':' )
+ if ( ( path.length() >= 2 ) && ( path.charAt( 1 ) == ':' ) )
{
path = path.substring( 0, 1 ).toUpperCase() + path.substring( 1 );
}
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java Wed Aug 30 04:10:37 2006
@@ -103,9 +103,13 @@
return token;
}
if ( isDelim( token ) )
+ {
return hasMoreTokens() ? internalNextToken() : "";
+ }
else
+ {
return token;
+ }
}
private boolean isDelim( String str )
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/Expand.java Wed Aug 30 04:10:37 2006
@@ -132,7 +132,7 @@
{
File f = fileUtils.resolveFile( dest, entryName );
- if ( !overwrite && f.exists() && f.lastModified() >= entryDate.getTime() )
+ if ( !overwrite && f.exists() && ( f.lastModified() >= entryDate.getTime() ) )
{
log.debug( "Skipping " + f + " as it is up-to-date" );
return;
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/util/HttpUtils.java Wed Aug 30 04:10:37 2006
@@ -49,7 +49,7 @@
public static void useProxyUser( final String proxyHost, final String proxyPort, final String proxyUserName,
final String proxyPassword )
{
- if ( proxyHost != null && proxyPort != null )
+ if ( ( proxyHost != null ) && ( proxyPort != null ) )
{
System.getProperties().put( "proxySet", "true" );
System.getProperties().put( "proxyHost", proxyHost );
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/jelly/ProjectTag.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/jelly/ProjectTag.java?rev=438461&r1=438460&r2=438461&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/jelly/ProjectTag.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/jelly/ProjectTag.java Wed Aug 30 04:10:37 2006
@@ -93,7 +93,7 @@
*/
public WerkzProject getProject()
{
- if ( project == null && context != null )
+ if ( ( project == null ) && ( context != null ) )
{
// we may be invoked inside a child script, so lets try find the parent project
project = (WerkzProject) context.findVariable( "org.apache.commons.jelly.werkz.Project" );