You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/06/23 23:45:18 UTC
svn commit: r1353204 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/
maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/
maven-scm-providers/mave...
Author: hboutemy
Date: Sat Jun 23 21:45:17 2012
New Revision: 1353204
URL: http://svn.apache.org/viewvc?rev=1353204&view=rev
Log:
code formatting
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java Sat Jun 23 21:45:17 2012
@@ -69,7 +69,8 @@ public abstract class AbstractChangeLogC
int numDays = parameters.getInt( CommandParameter.NUM_DAYS, 0 );
Integer limit = parameters.getInt( CommandParameter.LIMIT, -1 );
- if ( limit < 1 ) {
+ if ( limit < 1 )
+ {
limit = null;
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java Sat Jun 23 21:45:17 2012
@@ -158,12 +158,14 @@ public class ChangeLogScmRequest
public void setLimit( Integer limit )
throws ScmException
{
- if ( limit != null ) {
+ if ( limit != null )
+ {
parameters.setInt( CommandParameter.LIMIT, limit );
- } else {
+ }
+ else
+ {
parameters.remove( CommandParameter.LIMIT );
}
-
}
public void setDateRange( Date startDate, Date endDate )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/command/changelog/BazaarChangeLogCommand.java Sat Jun 23 21:45:17 2012
@@ -59,7 +59,8 @@ public class BazaarChangeLogCommand
final ScmVersion endVersion = request.getEndRevision();
final ScmFileSet fileSet = request.getScmFileSet();
final String datePattern = request.getDatePattern();
- if ( startVersion != null || endVersion != null ) {
+ if ( startVersion != null || endVersion != null )
+ {
final ScmProviderRepository scmProviderRepository = request.getScmRepository().getProviderRepository();
return executeChangeLogCommand( scmProviderRepository, fileSet, startVersion, endVersion, datePattern );
}
@@ -83,7 +84,8 @@ public class BazaarChangeLogCommand
{
List<String> cmd = new ArrayList<String>();
cmd.addAll( Arrays.asList( BazaarConstants.LOG_CMD, BazaarConstants.VERBOSE_OPTION ) );
- if ( limit != null && limit > 0 ) {
+ if ( limit != null && limit > 0 )
+ {
cmd.add( BazaarConstants.LIMIT_OPTION );
cmd.add( Integer.toString( limit ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.java Sat Jun 23 21:45:17 2012
@@ -60,9 +60,10 @@ public class HgChangeLogCommand
final ScmVersion endVersion = request.getEndRevision();
final ScmFileSet fileSet = request.getScmFileSet();
final String datePattern = request.getDatePattern();
- if ( startVersion != null || endVersion != null ) {
+ if ( startVersion != null || endVersion != null )
+ {
final ScmProviderRepository scmProviderRepository = request.getScmRepository().getProviderRepository();
- return executeChangeLogCommand( scmProviderRepository, fileSet, startVersion, endVersion, datePattern );
+ return executeChangeLogCommand( scmProviderRepository, fileSet, startVersion, endVersion, datePattern );
}
return executeChangeLogCommand( fileSet, request.getStartDate(), request.getEndDate(),
datePattern, request.getLimit() );
@@ -93,9 +94,11 @@ public class HgChangeLogCommand
List<String> cmd = new ArrayList<String>();
cmd.addAll( Arrays.asList( HgCommandConstants.LOG_CMD, HgCommandConstants.VERBOSE_OPTION,
- HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.DATE_OPTION, dateInterval.toString() ));
+ HgCommandConstants.NO_MERGES_OPTION, HgCommandConstants.DATE_OPTION,
+ dateInterval.toString() ) );
- if ( limit != null && limit > 0 ) {
+ if ( limit != null && limit > 0 )
+ {
cmd.add( HgCommandConstants.LIMIT_OPTION );
cmd.add( Integer.toString( limit ) );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogCommand.java Sat Jun 23 21:45:17 2012
@@ -180,7 +180,7 @@ public class GitChangeLogCommand
}
- if (limit != null && limit > 0)
+ if ( limit != null && limit > 0 )
{
cl.createArg().setValue( "--max-count=" + limit );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java Sat Jun 23 21:45:17 2012
@@ -156,7 +156,7 @@ public class SvnChangeLogCommand
// TODO: May want to add some kind of support for --stop-on-copy and --limit NUM
- if (limit != null && limit > 0)
+ if ( limit != null && limit > 0 )
{
cl.createArg().setValue( "--limit" );
cl.createArg().setValue( Integer.toString( limit ) );
@@ -212,7 +212,7 @@ public class SvnChangeLogCommand
}
}
- if (endVersion == null || !StringUtils.equals("BASE", endVersion.getName()))
+ if ( endVersion == null || !StringUtils.equals( "BASE", endVersion.getName() ) )
{
cl.createArg().setValue( repository.getUrl() );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java?rev=1353204&r1=1353203&r2=1353204&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommandTest.java Sat Jun 23 21:45:17 2012
@@ -130,28 +130,28 @@ public class SvnChangeLogCommandTest
public void testCommandLineWithStartVersion()
throws Exception
{
- testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision("1"), null,
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( "1" ), null,
"svn --non-interactive log -v -r 1:HEAD http://foo.com/svn/trunk" );
}
public void testCommandLineWithStartVersionAndEndVersion()
throws Exception
{
- testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision("1"), new ScmRevision("10"),
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( "1" ), new ScmRevision( "10" ),
"svn --non-interactive log -v -r 1:10 http://foo.com/svn/trunk" );
}
public void testCommandLineWithStartVersionAndEndVersionEquals()
throws Exception
{
- testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision("1"), new ScmRevision("1"),
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( "1" ), new ScmRevision( "1" ),
"svn --non-interactive log -v -r 1 http://foo.com/svn/trunk" );
}
public void testCommandLineWithBaseVersion()
throws Exception
{
- testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision("1"), new ScmRevision("BASE"),
+ testCommandLine( "scm:svn:http://foo.com/svn/trunk", new ScmRevision( "1" ), new ScmRevision( "BASE" ),
"svn --non-interactive log -v -r 1:BASE" );
}
@@ -162,7 +162,7 @@ public class SvnChangeLogCommandTest
private void testCommandLine( String scmUrl, ScmBranch branch, Date startDate, Date endDate, String commandLine )
throws Exception
{
- testCommandLine( scmUrl, branch, startDate, endDate, null, commandLine);
+ testCommandLine( scmUrl, branch, startDate, endDate, null, commandLine );
}
private void testCommandLine( String scmUrl, ScmBranch branch, Date startDate, Date endDate, Integer limit, String commandLine )