Author: olamy
Date: Fri Apr 20 21:13:09 2012
New Revision: 1328509
URL: http://svn.apache.org/viewvc?rev=1328509&view=rev
Log:
format code
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/changelog/HgChangeLogCommand.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=1328509&r1=1328508&r2=1328509&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
Fri Apr 20 21:13:09 2012
@@ -19,8 +19,6 @@ package org.apache.maven.scm.command.cha
* under the License.
*/
-import java.util.Date;
-
import org.apache.maven.scm.CommandParameter;
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmBranch;
@@ -31,6 +29,8 @@ import org.apache.maven.scm.ScmVersion;
import org.apache.maven.scm.command.AbstractCommand;
import org.apache.maven.scm.provider.ScmProviderRepository;
+import java.util.Date;
+
/**
* @author <a href="mailto:[email protected]";>Trygve Laugstøl</a>
* @author Olivier Lamy
@@ -53,7 +53,9 @@ public abstract class AbstractChangeLogC
throw new ScmException( "Unsupported method for this provider." );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public ScmResult executeCommand( ScmProviderRepository repository,
ScmFileSet fileSet,
CommandParameters parameters )
throws ScmException
@@ -72,7 +74,7 @@ public abstract class AbstractChangeLogC
String datePattern = parameters.getString(
CommandParameter.CHANGELOG_DATE_PATTERN, null );
- if ( startVersion != null || endVersion != null)
+ if ( startVersion != null || endVersion != null )
{
return executeChangeLogCommand( repository, fileSet, startVersion,
endVersion, datePattern );
}
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java?rev=1328509&r1=1328508&r2=1328509&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java
Fri Apr 20 21:13:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.scm.plugin;
* under the License.
*/
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
@@ -35,6 +30,11 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.util.StringUtils;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
/**
* Dump changelog contents to console. It is mainly used to test
maven-scm-api's changelog command.
*
@@ -62,7 +62,7 @@ public class ChangeLogMojo
* @parameter expression="${endDate}"
*/
private String endDate;
-
+
/**
* Start Scm Version.
*
@@ -76,7 +76,7 @@ public class ChangeLogMojo
* @parameter expression="${endScmVersion}"
*/
private String endScmVersion;
-
+
/**
* Start Scm Version Type.
*
@@ -119,7 +119,9 @@ public class ChangeLogMojo
*/
private String scmVersion;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void execute()
throws MojoExecutionException
{
@@ -132,21 +134,24 @@ public class ChangeLogMojo
ScmRepository repository = getScmRepository();
ScmProvider provider = getScmManager().getProviderByRepository(
repository );
-
- ScmVersion startRev = getScmVersion(
- StringUtils.isEmpty(startScmVersionType) ? "revision" :
startScmVersionType , startScmVersion );
- ScmVersion endRev = getScmVersion(
- StringUtils.isEmpty(endScmVersionType) ? "revision" :
endScmVersionType , endScmVersion );
+
+ ScmVersion startRev =
+ getScmVersion( StringUtils.isEmpty( startScmVersionType ) ?
"revision" : startScmVersionType,
+ startScmVersion );
+ ScmVersion endRev =
+ getScmVersion( StringUtils.isEmpty( endScmVersionType ) ?
"revision" : endScmVersionType,
+ endScmVersion );
ChangeLogScmResult result;
- if (startRev != null || endRev != null) {
- result = provider.changeLog( repository,
getFileSet(),startRev, endRev, dateFormat);
- } else {
- result = provider.changeLog( repository, getFileSet(),
- this.parseDate(
localFormat, this.startDate ),
- this.parseDate(
localFormat, this.endDate ), 0,
- (ScmBranch)
getScmVersion( scmVersionType, scmVersion ),
- dateFormat );
+ if ( startRev != null || endRev != null )
+ {
+ result = provider.changeLog( repository, getFileSet(),
startRev, endRev, dateFormat );
+ }
+ else
+ {
+ result = provider.changeLog( repository, getFileSet(),
this.parseDate( localFormat, this.startDate ),
+ this.parseDate( localFormat,
this.endDate ), 0,
+ (ScmBranch) getScmVersion(
scmVersionType, scmVersion ), dateFormat );
}
checkResult( result );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.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/HgCommandConstants.java?rev=1328509&r1=1328508&r2=1328509&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/HgCommandConstants.java
Fri Apr 20 21:13:09 2012
@@ -135,11 +135,11 @@ public final class HgCommandConstants
public static final String MESSAGE_OPTION = "--message";
public static final String REVISION_OPTION = "-r";
-
+
public static final String DATE_OPTION = "--date";
public static final String VERBOSE_OPTION = "--verbose";
-
+
public static final String NO_MERGES_OPTION = "--no-merges";
public static final String VERSION = "version";
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.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/blame/HgBlameCommand.java?rev=1328509&r1=1328508&r2=1328509&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameCommand.java
Fri Apr 20 21:13:09 2012
@@ -44,10 +44,10 @@ public class HgBlameCommand
String filename )
throws ScmException
{
- String[] cmd = new String[]{BLAME_CMD, "--user", // list the author
+ String[] cmd = new String[]{ BLAME_CMD, "--user", // list the author
"--date", // list the date
"--changeset", // list the global revision number
- filename};
+ filename };
HgBlameConsumer consumer = new HgBlameConsumer( getLogger() );
ScmResult result = HgUtils.execute( consumer, getLogger(),
workingDirectory.getBasedir(), cmd );
return new BlameScmResult( consumer.getLines(), result );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.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/blame/HgBlameConsumer.java?rev=1328509&r1=1328508&r2=1328509&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/blame/HgBlameConsumer.java
Fri Apr 20 21:13:09 2012
@@ -19,16 +19,16 @@ package org.apache.maven.scm.provider.hg
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.command.blame.BlameLine;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
/**
* @author Evgeny Mandrikov
@@ -52,11 +52,13 @@ public class HgBlameConsumer
{
/* godin 0 Sun Jan 31 03:04:54 2010 +0300 */
String annotation;
- if(trimmedLine.indexOf(": ") > -1)
+ if ( trimmedLine.indexOf( ": " ) > -1 )
+ {
+ annotation = trimmedLine.substring( 0, trimmedLine.indexOf( ": " )
).trim();
+ }
+ else
{
- annotation = trimmedLine.substring(0, trimmedLine.indexOf(":
")).trim();
- } else {
- annotation = trimmedLine.substring(0,
trimmedLine.lastIndexOf(":")).trim();
+ annotation = trimmedLine.substring( 0, trimmedLine.lastIndexOf(
":" ) ).trim();
}
String author = annotation.substring( 0, annotation.indexOf( ' ' ) );
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=1328509&r1=1328508&r2=1328509&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
Fri Apr 20 21:13:09 2012
@@ -19,10 +19,6 @@ package org.apache.maven.scm.provider.hg
* under the License.
*/
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmException;
@@ -37,6 +33,10 @@ import org.apache.maven.scm.provider.Scm
import org.apache.maven.scm.provider.hg.HgUtils;
import org.apache.maven.scm.provider.hg.command.HgCommandConstants;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
/**
* @author <a href="mailto:[email protected]";>thurner rupert</a>
* @author Olivier Lamy
@@ -46,26 +46,24 @@ public class HgChangeLogCommand
extends AbstractChangeLogCommand
implements Command
{
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected ChangeLogScmResult executeChangeLogCommand(
ScmProviderRepository scmProviderRepository,
ScmFileSet fileSet,
Date startDate, Date endDate,
ScmBranch branch,
String datePattern )
throws ScmException
{
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd" );
StringBuilder dateInterval = new StringBuilder();
// TRICK: Mercurial 1.9.3 don't accept 1970-01-01
- dateInterval.append(dateFormat.format(
- startDate == null ? new Date( 1000L*60*60*24) : startDate));
// From 2. Jan 1970
- dateInterval.append(" to ");
- dateInterval.append(dateFormat.format(endDate == null ? new Date() :
endDate)); // Upto now
-
- String[] cmd = new String[] { HgCommandConstants.LOG_CMD,
- HgCommandConstants.VERBOSE_OPTION,
- HgCommandConstants.NO_MERGES_OPTION,
- HgCommandConstants.DATE_OPTION,
- dateInterval.toString()
- };
+ dateInterval.append(
+ dateFormat.format( startDate == null ? new Date( 1000L * 60 * 60 *
24 ) : startDate ) ); // From 2. Jan 1970
+ dateInterval.append( " to " );
+ dateInterval.append( dateFormat.format( endDate == null ? new Date() :
endDate ) ); // Upto now
+
+ String[] cmd = new String[]{ HgCommandConstants.LOG_CMD,
HgCommandConstants.VERBOSE_OPTION,
+ HgCommandConstants.NO_MERGES_OPTION,
HgCommandConstants.DATE_OPTION, dateInterval.toString() };
HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(),
datePattern );
ScmResult result = HgUtils.execute( consumer, getLogger(),
fileSet.getBasedir(), cmd );
@@ -75,34 +73,38 @@ public class HgChangeLogCommand
}
@Override
- protected ChangeLogScmResult executeChangeLogCommand(
- ScmProviderRepository repository, ScmFileSet fileSet,
- ScmVersion startVersion, ScmVersion endVersion, String datePattern)
- throws ScmException {
+ protected ChangeLogScmResult executeChangeLogCommand(
ScmProviderRepository repository, ScmFileSet fileSet,
+ ScmVersion
startVersion, ScmVersion endVersion,
+ String datePattern )
+ throws ScmException
+ {
StringBuilder revisionInterval = new StringBuilder();
- if (startVersion != null)
revisionInterval.append(startVersion.getName());
- revisionInterval.append(":");
- if (endVersion != null) revisionInterval.append(endVersion.getName());
-
- String[] cmd = new String[] { HgCommandConstants.LOG_CMD,
- HgCommandConstants.VERBOSE_OPTION,
- HgCommandConstants.NO_MERGES_OPTION,
- HgCommandConstants.REVISION_OPTION,
- revisionInterval.toString()
- };
+ if ( startVersion != null )
+ {
+ revisionInterval.append( startVersion.getName() );
+ }
+ revisionInterval.append( ":" );
+ if ( endVersion != null )
+ {
+ revisionInterval.append( endVersion.getName() );
+ }
+
+ String[] cmd = new String[]{ HgCommandConstants.LOG_CMD,
HgCommandConstants.VERBOSE_OPTION,
+ HgCommandConstants.NO_MERGES_OPTION,
HgCommandConstants.REVISION_OPTION, revisionInterval.toString() };
HgChangeLogConsumer consumer = new HgChangeLogConsumer( getLogger(),
datePattern );
ScmResult result = HgUtils.execute( consumer, getLogger(),
fileSet.getBasedir(), cmd );
List<ChangeSet> logEntries = consumer.getModifications();
Date startDate = null;
Date endDate = null;
- if (!logEntries.isEmpty()) {
- startDate = logEntries.get(0).getDate();
- endDate = logEntries.get(logEntries.size() - 1).getDate();
+ if ( !logEntries.isEmpty() )
+ {
+ startDate = logEntries.get( 0 ).getDate();
+ endDate = logEntries.get( logEntries.size() - 1 ).getDate();
}
ChangeLogSet changeLogSet = new ChangeLogSet( logEntries, startDate,
endDate );
- changeLogSet.setStartVersion(startVersion);
- changeLogSet.setEndVersion(endVersion);
+ changeLogSet.setStartVersion( startVersion );
+ changeLogSet.setEndVersion( endVersion );
return new ChangeLogScmResult( changeLogSet, result );
}
}
