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/07/22 00:00:31 UTC
svn commit: r424472 - in /maven/maven-1/core/trunk/src:
java/org/apache/maven/jelly/ java/org/apache/maven/plugin/
java/org/apache/maven/util/ java/org/apache/maven/verifier/
test/java/org/apache/maven/jelly/tags/maven/
Author: aheritier
Date: Fri Jul 21 15:00:31 2006
New Revision: 424472
URL: http://svn.apache.org/viewvc?rev=424472&view=rev
Log:
Always surround if and loop statements with curly braces
Modified:
maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/JellyUtils.java
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginManager.java
maven/maven-1/core/trunk/src/java/org/apache/maven/util/EnhancedStringTokenizer.java
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java
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=424472&r1=424471&r2=424472&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 Fri Jul 21 15:00:31 2006
@@ -272,7 +272,9 @@
}
if ( systemId != null )
+ {
source.setSystemId( systemId );
+ }
if ( log.isDebugEnabled() )
log.debug( "the system identifier to help resolve relative URLs : " + systemId );
script = parser.parse( source );
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=424472&r1=424471&r2=424472&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 Fri Jul 21 15:00:31 2006
@@ -1159,7 +1159,9 @@
try
{
if ( log.isDebugEnabled() )
+ {
log.debug( "Jelly script to parse : " + jellyScriptHousing.getSource().toURL() );
+ }
Script script = JellyUtils.compileScript( jellyScriptHousing.getSource(), context );
context.setRootURL( oldRoot );
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=424472&r1=424471&r2=424472&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 Fri Jul 21 15:00:31 2006
@@ -99,7 +99,9 @@
{
String token = internalNextToken();
if ( creturnDelims )
+ {
return token;
+ }
if ( isDelim( token ) )
return hasMoreTokens() ? internalNextToken() : "";
else
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java?rev=424472&r1=424471&r2=424472&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java (original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java Fri Jul 21 15:00:31 2006
@@ -675,7 +675,9 @@
{
File checksumFile = new File( destination + checksumFileExtension );
if ( checksumFile.exists() )
+ {
checksumFile.delete();
+ }
FileUtils.copyFile( tempChecksumFile, checksumFile );
}
else
Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java?rev=424472&r1=424471&r2=424472&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java (original)
+++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java Fri Jul 21 15:00:31 2006
@@ -205,7 +205,9 @@
{
Project p = (Project) projects.get( i );
if ( p.getId().equals( id ) )
+ {
return i;
+ }
}
throw new IllegalArgumentException( "No such project: " + id );
}
@@ -219,7 +221,9 @@
Project project = (Project) iter.next();
buf.append( project.getId() );
if ( iter.hasNext() )
+ {
buf.append( "," );
+ }
}
return buf.toString();
}