Author: olamy Date: Wed Aug 20 14:59:06 2008 New Revision: 687485 URL: http://svn.apache.org/viewvc?rev=687485&view=rev Log: fix checkstyle issues
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/GitExeScmProvider.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/GitCommandLineUtils.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/add/GitAddCommand.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/branch/GitBranchCommand.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-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.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/checkin/GitCheckInCommand.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/checkout/GitCheckOutCommand.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/diff/GitDiffCommand.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/list/GitListCommand.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/tag/GitTagCommand.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/update/GitUpdateCommand.java 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/GitExeScmProvider.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/GitExeScmProvider.java?rev=687485&r1=687484&r2=687485&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/GitExeScmProvider.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/GitExeScmProvider.java Wed Aug 20 14:59:06 2008 @@ -135,8 +135,8 @@ if ( result.getInfoItems().size() != 1 ) { - throw new ScmRepositoryException( "Cannot find URL: " + - ( result.getInfoItems().size() == 0 ? "no" : "multiple" ) + " items returned by the info command" ); + throw new ScmRepositoryException( "Cannot find URL: " + + ( result.getInfoItems().size() == 0 ? "no" : "multiple" ) + " items returned by the info command" ); } return ( (GitInfoItem) result.getInfoItems().get( 0 ) ).getURL(); 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/GitCommandLineUtils.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/GitCommandLineUtils.java?rev=687485&r1=687484&r2=687485&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/GitCommandLineUtils.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/GitCommandLineUtils.java Wed Aug 20 14:59:06 2008 @@ -51,7 +51,7 @@ File f = (File) i.next(); String relativeFile = f.getPath(); - if ( f.getAbsolutePath().startsWith( cl.getWorkingDirectory().getAbsolutePath() )) + if ( f.getAbsolutePath().startsWith( cl.getWorkingDirectory().getAbsolutePath() ) ) { // so we can omit the starting characters relativeFile = relativeFile.substring( cl.getWorkingDirectory().getAbsolutePath().length() ); @@ -70,7 +70,7 @@ public static Commandline getBaseGitCommandLine( File workingDirectory, String command ) { - if ( command == null || command.length() == 0) + if ( command == null || command.length() == 0 ) { return null; } 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/add/GitAddCommand.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/add/GitAddCommand.java?rev=687485&r1=687484&r2=687485&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/add/GitAddCommand.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/add/GitAddCommand.java Wed Aug 20 14:59:06 2008 @@ -43,7 +43,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitAddCommand extends AbstractAddCommand implements GitCommand +public class GitAddCommand + extends AbstractAddCommand + implements GitCommand { /** [EMAIL PROTECTED] */ protected ScmResult executeAddCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message, @@ -94,7 +96,7 @@ for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); ) { File f = (File) itfl.next(); - if ( f.toString().equals( scmfile.getPath() )) + if ( f.toString().equals( scmfile.getPath() ) ) { changedFiles.add( scmfile ); } @@ -103,7 +105,7 @@ return new AddScmResult( cl.toString(), changedFiles ); } - public static Commandline createCommandLine( File workingDirectory, List/*File*/ files ) + public static Commandline createCommandLine( File workingDirectory, List/*File*/files ) throws ScmException { Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "add" ); 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/branch/GitBranchCommand.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/branch/GitBranchCommand.java?rev=687485&r1=687484&r2=687485&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/branch/GitBranchCommand.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/branch/GitBranchCommand.java Wed Aug 20 14:59:06 2008 @@ -41,11 +41,12 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitBranchCommand extends AbstractBranchCommand implements GitCommand +public class GitBranchCommand + extends AbstractBranchCommand + implements GitCommand { /** [EMAIL PROTECTED] */ - public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch, - String message ) + public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch, String message ) throws ScmException { if ( branch == null || StringUtils.isEmpty( branch.trim() ) ) @@ -82,16 +83,15 @@ } // as last action we search for the branched files - GitListConsumer listConsumer = new GitListConsumer( getLogger() - , fileSet.getBasedir() - , ScmFileStatus.TAGGED); + GitListConsumer listConsumer = new GitListConsumer( getLogger(), fileSet.getBasedir(), ScmFileStatus.TAGGED ); Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() ); exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() ); if ( exitCode != 0 ) { - return new BranchScmResult( clList.toString(), "The git-ls-files command failed.", stderr.getOutput(), false ); + return new BranchScmResult( clList.toString(), "The git-ls-files command failed.", stderr.getOutput(), + false ); } return new BranchScmResult( cl.toString(), listConsumer.getListedFiles() ); @@ -113,9 +113,9 @@ public static Commandline createPushCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet, String branch ) - throws ScmException + throws ScmException { - Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push"); + Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" ); cl.createArgument().setValue( "origin" ); cl.createArgument().setValue( branch ); 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=687485&r1=687484&r2=687485&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 Wed Aug 20 14:59:06 2008 @@ -107,7 +107,8 @@ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "log" ); - if ( startVersion != null ) { + if ( startVersion != null ) + { cl.createArgument().setValue( "--since=" + StringUtils.escape( startVersion.getName() ) ); } else @@ -118,7 +119,8 @@ } } - if ( endVersion != null ) { + if ( endVersion != null ) + { cl.createArgument().setValue( "--until=" + StringUtils.escape( endVersion.getName() ) ); } else 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/GitChangeLogConsumer.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/GitChangeLogConsumer.java?rev=687485&r1=687484&r2=687485&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/GitChangeLogConsumer.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/GitChangeLogConsumer.java Wed Aug 20 14:59:06 2008 @@ -69,7 +69,6 @@ */ private static final int STATUS_GET_COMMENT = 5; - /** * The pattern used to match git header lines */ @@ -88,7 +87,7 @@ /** * The pattern used to match git file lines */ -//X private static final String FILE_PATTERN = "^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:]) (.*)"; + //X private static final String FILE_PATTERN = "^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:]) (.*)"; private static final String FILE_PATTERN = "^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:])\\t(.*)"; /** @@ -136,7 +135,6 @@ */ private RE fileRegexp; - private String userDateFormat; /** @@ -152,14 +150,14 @@ { headerRegexp = new RE( HEADER_PATTERN ); authorRegexp = new RE( AUTHOR_PATTERN ); - dateRegexp = new RE( DATE_PATTERN ); - fileRegexp = new RE( FILE_PATTERN ); + dateRegexp = new RE( DATE_PATTERN ); + fileRegexp = new RE( FILE_PATTERN ); } catch ( RESyntaxException ex ) { throw new RuntimeException( - "INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't happen. Something is probably wrong with the oro installation.", - ex ); + "INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't happen. Something is probably wrong with the oro installation.", + ex ); } } @@ -200,8 +198,6 @@ } } - - // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- @@ -263,7 +259,7 @@ String datestring = dateRegexp.getParen( 1 ); - Date date = parseDate( datestring.trim() , userDateFormat, GIT_TIMESTAMP_PATTERN, locale ); + Date date = parseDate( datestring.trim(), userDateFormat, GIT_TIMESTAMP_PATTERN, locale ); currentChange.setDate( date ); @@ -280,7 +276,7 @@ { if ( line.length() < 4 ) { - if (currentComment == null) + if ( currentComment == null ) { currentComment = new StringBuffer(); } @@ -292,7 +288,8 @@ } else { - if ( currentComment.length() > 0 ) { + if ( currentComment.length() > 0 ) + { currentComment.append( '\n' ); } @@ -336,7 +333,8 @@ } } - private void resetChangeLog() { + private void resetChangeLog() + { currentComment = null; currentChange = null; } 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/checkin/GitCheckInCommand.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/checkin/GitCheckInCommand.java?rev=687485&r1=687484&r2=687485&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/checkin/GitCheckInCommand.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/checkin/GitCheckInCommand.java Wed Aug 20 14:59:06 2008 @@ -48,7 +48,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitCheckInCommand extends AbstractCheckInCommand implements GitCommand +public class GitCheckInCommand + extends AbstractCheckInCommand + implements GitCommand { /** [EMAIL PROTECTED] */ protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message, @@ -69,8 +71,8 @@ } catch ( IOException ex ) { - return new CheckInScmResult( null, "Error while making a temporary file for the commit message: " + - ex.getMessage(), null, false ); + return new CheckInScmResult( null, "Error while making a temporary file for the commit message: " + + ex.getMessage(), null, false ); } try @@ -86,7 +88,8 @@ if ( exitCode != 0 ) { - return new CheckInScmResult( clAdd.toString(), "The git-add command failed.", stderr.getOutput(), false ); + return new CheckInScmResult( clAdd.toString(), "The git-add command failed.", stderr.getOutput(), + false ); } } @@ -104,12 +107,13 @@ getLogger().info( "nothing added to commit but untracked files present (use \"git add\" to track)" ); } - Commandline clCommit = createCommitCommandLine(repository, fileSet, messageFile); + Commandline clCommit = createCommitCommandLine( repository, fileSet, messageFile ); exitCode = GitCommandLineUtils.execute( clCommit, stdout, stderr, getLogger() ); if ( exitCode != 0 ) { - return new CheckInScmResult( clCommit.toString(), "The git-commit command failed.", stderr.getOutput(), false ); + return new CheckInScmResult( clCommit.toString(), "The git-commit command failed.", stderr.getOutput(), + false ); } Commandline cl = createPushCommandLine( repository, fileSet, version ); @@ -125,9 +129,10 @@ // rewrite all detected files to now have status 'checked_in' for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); ) { - ScmFile scmfile = new ScmFile( ((ScmFile) it.next()).getPath(), ScmFileStatus.CHECKED_IN ); + ScmFile scmfile = new ScmFile( ( (ScmFile) it.next() ).getPath(), ScmFileStatus.CHECKED_IN ); - if ( fileSet.getFileList().isEmpty() ) { + if ( fileSet.getFileList().isEmpty() ) + { checkedInFiles.add( scmfile ); } else @@ -136,7 +141,7 @@ for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); ) { File f = (File) itfl.next(); - if ( f.toString().equals( scmfile.getPath() )) + if ( f.toString().equals( scmfile.getPath() ) ) { checkedInFiles.add( scmfile ); } @@ -169,7 +174,7 @@ ScmVersion version ) throws ScmException { - Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push"); + Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" ); //X TODO handle version 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/checkout/GitCheckOutCommand.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/checkout/GitCheckOutCommand.java?rev=687485&r1=687484&r2=687485&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/checkout/GitCheckOutCommand.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/checkout/GitCheckOutCommand.java Wed Aug 20 14:59:06 2008 @@ -42,7 +42,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitCheckOutCommand extends AbstractCheckOutCommand implements GitCommand +public class GitCheckOutCommand + extends AbstractCheckOutCommand + implements GitCommand { /** * For git, the given repository is a remote one. @@ -58,8 +60,8 @@ { GitScmProviderRepository repository = (GitScmProviderRepository) repo; - if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) && - repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) + if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) + && repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) { throw new ScmException( "remote repository must not be the working directory" ); } @@ -69,9 +71,7 @@ CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer(); CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - - if ( !fileSet.getBasedir().exists() || - !( new File( fileSet.getBasedir(), ".git" ).exists() ) ) + if ( !fileSet.getBasedir().exists() || !( new File( fileSet.getBasedir(), ".git" ).exists() ) ) { if ( fileSet.getBasedir().exists() ) { @@ -85,12 +85,12 @@ exitCode = GitCommandLineUtils.execute( clClone, stdout, stderr, getLogger() ); if ( exitCode != 0 ) { - return new CheckOutScmResult( clClone.toString(), "The git-clone command failed.", stderr.getOutput(), false ); + return new CheckOutScmResult( clClone.toString(), "The git-clone command failed.", stderr.getOutput(), + false ); } } - if ( fileSet.getBasedir().exists() && - new File( fileSet.getBasedir(), ".git" ).exists() ) + if ( fileSet.getBasedir().exists() && new File( fileSet.getBasedir(), ".git" ).exists() ) { // git repo exists, so we must git-pull the changes Commandline clPull = createPullCommand( repository, fileSet.getBasedir(), version ); @@ -98,7 +98,8 @@ exitCode = GitCommandLineUtils.execute( clPull, stdout, stderr, getLogger() ); if ( exitCode != 0 ) { - return new CheckOutScmResult( clPull.toString(), "The git-pull command failed.", stderr.getOutput(), false ); + return new CheckOutScmResult( clPull.toString(), "The git-pull command failed.", stderr.getOutput(), + false ); } } @@ -112,16 +113,15 @@ } // and now search for the files - GitListConsumer listConsumer = new GitListConsumer( getLogger() - , fileSet.getBasedir() - , ScmFileStatus.CHECKED_IN); + GitListConsumer listConsumer = new GitListConsumer( getLogger(), fileSet.getBasedir(), ScmFileStatus.CHECKED_IN ); Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() ); exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() ); if ( exitCode != 0 ) { - return new CheckOutScmResult( clList.toString(), "The git-ls-files command failed.", stderr.getOutput(), false ); + return new CheckOutScmResult( clList.toString(), "The git-ls-files command failed.", stderr.getOutput(), + false ); } return new CheckOutScmResult( cl.toString(), listConsumer.getListedFiles() ); @@ -136,7 +136,6 @@ { Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "checkout" ); - if ( version != null && StringUtils.isNotEmpty( version.getName() ) ) { cl.createArgument().setValue( version.getName() ); @@ -181,7 +180,8 @@ cl.createArgument().setValue( version.getName() + ":" + version.getName() ); } } - else { + else + { cl.createArgument().setValue( "master" ); } return cl; 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/diff/GitDiffCommand.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/diff/GitDiffCommand.java?rev=687485&r1=687484&r2=687485&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/diff/GitDiffCommand.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/diff/GitDiffCommand.java Wed Aug 20 14:59:06 2008 @@ -38,11 +38,13 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitDiffCommand extends AbstractDiffCommand implements GitCommand +public class GitDiffCommand + extends AbstractDiffCommand + implements GitCommand { /** [EMAIL PROTECTED] */ - protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, ScmVersion startVersion, - ScmVersion endVersion ) + protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, + ScmVersion startVersion, ScmVersion endVersion ) throws ScmException { GitDiffConsumer consumer = new GitDiffConsumer( getLogger(), fileSet.getBasedir() ); @@ -54,7 +56,8 @@ exitCode = GitCommandLineUtils.execute( clDiff2Index, consumer, stderr, getLogger() ); if ( exitCode != 0 ) { - return new DiffScmResult( clDiff2Index.toString(), "The git-diff command failed.", stderr.getOutput(), false ); + return new DiffScmResult( clDiff2Index.toString(), "The git-diff command failed.", stderr.getOutput(), + false ); } Commandline clDiff2Head = createCommandLine( fileSet.getBasedir(), startVersion, endVersion, true ); @@ -76,11 +79,13 @@ /** * @param cached if <code>true</code> diff the index to the head, else diff the tree to the index */ - public static Commandline createCommandLine( File workingDirectory, ScmVersion startVersion, ScmVersion endVersion, boolean cached ) + public static Commandline createCommandLine( File workingDirectory, ScmVersion startVersion, ScmVersion endVersion, + boolean cached ) { Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "diff" ); - if ( cached ) { + if ( cached ) + { cl.createArgument().setValue( "--cached" ); } 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/list/GitListCommand.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/list/GitListCommand.java?rev=687485&r1=687484&r2=687485&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/list/GitListCommand.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/list/GitListCommand.java Wed Aug 20 14:59:06 2008 @@ -29,7 +29,6 @@ import org.apache.maven.scm.provider.git.command.GitCommand; import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; import org.apache.maven.scm.provider.git.gitexe.command.GitCommandLineUtils; -import org.apache.maven.scm.provider.git.gitexe.command.list.GitListConsumer; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; @@ -39,17 +38,19 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitListCommand extends AbstractListCommand implements GitCommand +public class GitListCommand + extends AbstractListCommand + implements GitCommand { /** [EMAIL PROTECTED] */ - protected ListScmResult executeListCommand( ScmProviderRepository repo, ScmFileSet fileSet, - boolean recursive, ScmVersion scmVersion ) + protected ListScmResult executeListCommand( ScmProviderRepository repo, ScmFileSet fileSet, boolean recursive, + ScmVersion scmVersion ) throws ScmException { GitScmProviderRepository repository = (GitScmProviderRepository) repo; - if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) && - repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) + if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) + && repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) { throw new ScmException( "remote repository must not be the working directory" ); } @@ -57,9 +58,8 @@ int exitCode; CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - GitListConsumer consumer = new GitListConsumer( getLogger() - , fileSet.getBasedir().getParentFile() - , ScmFileStatus.CHECKED_IN ); + GitListConsumer consumer = new GitListConsumer( getLogger(), fileSet.getBasedir().getParentFile(), + ScmFileStatus.CHECKED_IN ); Commandline cl = createCommandLine( repository, fileSet.getBasedir() ); 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/tag/GitTagCommand.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/tag/GitTagCommand.java?rev=687485&r1=687484&r2=687485&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/tag/GitTagCommand.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/tag/GitTagCommand.java Wed Aug 20 14:59:06 2008 @@ -44,7 +44,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Mark Struberg</a> * @version $Id$ */ -public class GitTagCommand extends AbstractTagCommand implements GitCommand +public class GitTagCommand + extends AbstractTagCommand + implements GitCommand { /** [EMAIL PROTECTED] */ public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message ) @@ -70,12 +72,10 @@ } catch ( IOException ex ) { - return new TagScmResult( null, - "Error while making a temporary file for the commit message: " + ex.getMessage(), - null, false ); + return new TagScmResult( null, "Error while making a temporary file for the commit message: " + + ex.getMessage(), null, false ); } - try { CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer(); @@ -101,16 +101,15 @@ } // plus search for the tagged files - GitListConsumer listConsumer = new GitListConsumer( getLogger() - , fileSet.getBasedir() - , ScmFileStatus.TAGGED ); + GitListConsumer listConsumer = new GitListConsumer( getLogger(), fileSet.getBasedir(), ScmFileStatus.TAGGED ); Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() ); exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() ); if ( exitCode != 0 ) { - return new CheckOutScmResult( clList.toString(), "The git-ls-files command failed.", stderr.getOutput(), false ); + return new CheckOutScmResult( clList.toString(), "The git-ls-files command failed.", + stderr.getOutput(), false ); } return new TagScmResult( clTag.toString(), listConsumer.getListedFiles() ); @@ -133,8 +132,8 @@ // // ---------------------------------------------------------------------- - public static Commandline createCommandLine( GitScmProviderRepository repository, File workingDirectory, String tag, - File messageFile ) + public static Commandline createCommandLine( GitScmProviderRepository repository, File workingDirectory, + String tag, File messageFile ) { Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "tag" ); @@ -147,16 +146,15 @@ return cl; } - public static Commandline createPushCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet, - String tag ) - throws ScmException - { - Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push"); + public static Commandline createPushCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet, String tag ) + throws ScmException + { + Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" ); - cl.createArgument().setValue( "origin" ); - cl.createArgument().setValue( tag ); + cl.createArgument().setValue( "origin" ); + cl.createArgument().setValue( tag ); - return cl; - } + return cl; + } } 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/update/GitUpdateCommand.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/update/GitUpdateCommand.java?rev=687485&r1=687484&r2=687485&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/update/GitUpdateCommand.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/update/GitUpdateCommand.java Wed Aug 20 14:59:06 2008 @@ -38,7 +38,9 @@ * @since 10 august 2008 * @version $Id$ */ -public class GitUpdateCommand extends AbstractUpdateCommand implements GitCommand +public class GitUpdateCommand + extends AbstractUpdateCommand + implements GitCommand { /** [EMAIL PROTECTED] */ protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet, @@ -47,16 +49,15 @@ { GitScmProviderRepository repository = (GitScmProviderRepository) repo; - if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) && - repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) + if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) + && repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) { throw new ScmException( "remote repository must not be the working directory" ); } int exitCode; - GitUpdateCommandConsumer consumer = new GitUpdateCommandConsumer( getLogger(), fileSet - .getBasedir() ); + GitUpdateCommandConsumer consumer = new GitUpdateCommandConsumer( getLogger(), fileSet.getBasedir() ); CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); @@ -67,7 +68,8 @@ if ( exitCode != 0 ) { getLogger().warn( "failed to update git, return code " + exitCode ); - return new UpdateScmResult( cl.toString(), "The git-pull origin master command failed.", stderr.getOutput(), false ); + return new UpdateScmResult( cl.toString(), "The git-pull origin master command failed.", + stderr.getOutput(), false ); } return new UpdateScmResultWithRevision( cl.toString(), consumer.getUpdatedFiles(), null ); }