Author: olamy
Date: Sun Jan 9 20:11:26 2011
New Revision: 1057016
URL: http://svn.apache.org/viewvc?rev=1057016&view=rev
Log:
[SCM-591] Move to Java 1.5 : fix some generics warning in git provider
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.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/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/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/AbstractGitScmProvider.java
Sun Jan 9 20:11:26 2011
@@ -68,7 +68,7 @@ public abstract class AbstractGitScmProv
*/
private static class ScmUrlParserResult
{
- private List messages = new ArrayList();
+ private List<String> messages = new ArrayList<String>();
private ScmProviderRepository repository;
}
@@ -139,9 +139,9 @@ public abstract class AbstractGitScmProv
throws ScmException;
/** {...@inheritdoc} */
- public List validateScmUrl( String scmSpecificUrl, char delimiter )
+ public List<String> validateScmUrl( String scmSpecificUrl, char delimiter )
{
- List messages = new ArrayList();
+ List<String> messages = new ArrayList<String>();
try
{
makeProviderScmRepository( scmSpecificUrl, delimiter );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitChangeSet.java
Sun Jan 9 20:11:26 2011
@@ -19,16 +19,12 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
-import org.apache.maven.scm.ChangeFile;
-import org.apache.maven.scm.ChangeSet;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
-import org.codehaus.plexus.util.StringUtils;
-
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
+import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
+
/**
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
* @version $Id$
@@ -36,6 +32,9 @@ import java.util.List;
public class GitChangeSet
extends ChangeSet
{
+
+ private static final long serialVersionUID = 3173905308065007821L;
+
public GitChangeSet()
{
super();
@@ -48,7 +47,7 @@ public class GitChangeSet
* @param author
* @param files List of {...@link ChangeFile}
*/
- public GitChangeSet( String strDate, String userDatePattern, String
comment, String author, List files )
+ public GitChangeSet( String strDate, String userDatePattern, String
comment, String author, List<ChangeFile> files )
{
super( strDate, userDatePattern, comment, author, files );
}
@@ -59,7 +58,7 @@ public class GitChangeSet
* @param author
* @param files List of {...@link ChangeFile}
*/
- public GitChangeSet( Date date, String comment, String author, List files )
+ public GitChangeSet( Date date, String comment, String author,
List<ChangeFile> files )
{
super( date, comment, author, files );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/GitConfigFileReader.java
Sun Jan 9 20:11:26 2011
@@ -71,12 +71,12 @@ public class GitConfigFileReader
public String getProperty( String group, String propertyName )
{
- List lines = getConfLines();
+ List<String> lines = getConfLines();
boolean inGroup = false;
- for ( Iterator i = lines.iterator(); i.hasNext(); )
+ for ( Iterator<String> i = lines.iterator(); i.hasNext(); )
{
- String line = ( (String) i.next() ).trim();
+ String line = i.next().trim();
if ( !inGroup )
{
@@ -122,9 +122,9 @@ public class GitConfigFileReader
*
* @return the list of all lines
*/
- private List getConfLines()
+ private List<String> getConfLines()
{
- List lines = new ArrayList();
+ List<String> lines = new ArrayList<String>();
BufferedReader reader = null;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
Sun Jan 9 20:11:26 2011
@@ -19,11 +19,11 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.ScmResult;
+
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
* @version $Id$
@@ -31,30 +31,32 @@ import java.util.List;
public class GitInfoScmResult
extends ScmResult
{
- private List infoItems;
+
+ private static final long serialVersionUID = -1314905338508176675L;
+ private List<GitInfoItem> infoItems;
public GitInfoScmResult( String commandLine, String providerMessage,
String commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
- infoItems = new ArrayList( 0 );
+ infoItems = new ArrayList<GitInfoItem>( 0 );
}
- public GitInfoScmResult( String commandLine, List files )
+ public GitInfoScmResult( String commandLine, List<GitInfoItem> files )
{
super( commandLine, null, null, true );
this.infoItems = files;
}
- public GitInfoScmResult( List files, ScmResult result )
+ public GitInfoScmResult( List<GitInfoItem> files, ScmResult result )
{
super( result );
this.infoItems = files;
}
- public List getInfoItems()
+ public List<GitInfoItem> getInfoItems()
{
return infoItems;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateScmResult.java
Sun Jan 9 20:11:26 2011
@@ -19,10 +19,11 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
-import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
+
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
* @version $Id$
@@ -31,7 +32,9 @@ import java.util.List;
public class GitUpdateScmResult
extends UpdateScmResultWithRevision
{
- public GitUpdateScmResult( String commandLine, List updatedFiles, int
revision )
+ private static final long serialVersionUID = 7360578324181996847L;
+
+ public GitUpdateScmResult( String commandLine, List<ScmFile> updatedFiles,
int revision )
{
super( commandLine, updatedFiles, String.valueOf( revision ) );
}
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=1057016&r1=1057015&r2=1057016&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
Sun Jan 9 20:11:26 2011
@@ -19,11 +19,12 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.provider.git.AbstractGitScmProvider;
import org.apache.maven.scm.provider.git.command.GitCommand;
-import org.apache.maven.scm.provider.git.command.info.GitInfoItem;
import org.apache.maven.scm.provider.git.command.info.GitInfoScmResult;
import org.apache.maven.scm.provider.git.gitexe.command.add.GitAddCommand;
import org.apache.maven.scm.provider.git.gitexe.command.blame.GitBlameCommand;
@@ -39,8 +40,6 @@ import org.apache.maven.scm.provider.git
import
org.apache.maven.scm.provider.git.gitexe.command.update.GitUpdateCommand;
import org.apache.maven.scm.repository.ScmRepositoryException;
-import java.io.File;
-
/**
* @author <a href="mailto:eveni...@apache.org";>Emmanuel Venisse</a>
* @version $Id$
@@ -147,6 +146,6 @@ public class GitExeScmProvider
+ ( result.getInfoItems().size() == 0 ? "no" : "multiple" ) +
" items returned by the info command" );
}
- return ( (GitInfoItem) result.getInfoItems().get( 0 ) ).getURL();
+ return 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=1057016&r1=1057015&r2=1057016&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
Sun Jan 9 20:11:26 2011
@@ -39,16 +39,16 @@ import java.util.List;
*/
public class GitCommandLineUtils
{
- public static void addTarget( Commandline cl, List/*<File>*/ files )
+ public static void addTarget( Commandline cl, List<File> files )
{
if ( files == null || files.isEmpty() )
{
return;
}
- for ( Iterator i = files.iterator(); i.hasNext(); )
+ for ( Iterator<File> i = files.iterator(); i.hasNext(); )
{
- File f = (File) i.next();
+ File f = i.next();
String relativeFile = f.getPath();
if ( f.getAbsolutePath().startsWith(
cl.getWorkingDirectory().getAbsolutePath() ) )
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitExeAddCommandTest.java
Sun Jan 9 20:11:26 2011
@@ -38,7 +38,7 @@ public class GitExeAddCommandTest
public void testAddCommandSingleFile() throws Exception
{
- List/*File*/ files = new ArrayList();
+ List<File> files = new ArrayList<File>();
files.add( new File( "myFile.java" ) );
@@ -47,7 +47,7 @@ public class GitExeAddCommandTest
public void testAddCommandMultipleFiles() throws Exception
{
- List/*File*/ files = new ArrayList();
+ List<File> files = new ArrayList<File>();
files.add( new File( "myFile.java" ) );
files.add( new File( "myFile2.java" ) );
@@ -60,7 +60,7 @@ public class GitExeAddCommandTest
// private helper functions
// ----------------------------------------------------------------------
- private void testCommandLine( String scmUrl, List files, String
commandLine )
+ private void testCommandLine( String scmUrl, List<File> files, String
commandLine )
throws Exception
{
File workingDirectory = getTestFile( "target/git-add-command-test" );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/blame/GitExeBlameCommandTckTest.java
Sun Jan 9 20:11:26 2011
@@ -46,7 +46,7 @@ public class GitExeBlameCommandTckTest
protected void verifyResult( BlameScmResult result )
{
- List lines = result.getLines();
+ List<BlameLine> lines = result.getLines();
assertEquals( "Expected 1 line in blame", 1, lines.size() );
BlameLine line = (BlameLine) lines.get( 0 );
assertEquals( "Mark Struberg", line.getAuthor() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumerTest.java
Sun Jan 9 20:11:26 2011
@@ -65,13 +65,13 @@ public class GitChangeLogConsumerTest
consumer.consumeLine( line );
}
- List modifications = consumer.getModifications();
+ List<ChangeSet> modifications = consumer.getModifications();
assertEquals( 6, modifications.size() );
- for ( Iterator i = modifications.iterator(); i.hasNext(); )
+ for ( Iterator<ChangeSet> i = modifications.iterator(); i.hasNext(); )
{
- ChangeSet entry = (ChangeSet) i.next();
+ ChangeSet entry = i.next();
assertEquals( "Mark Struberg <strub...@yahoo.de>",
entry.getAuthor() );
@@ -117,11 +117,11 @@ public class GitChangeLogConsumerTest
consumer.consumeLine( line );
}
- List modifications = consumer.getModifications();
+ List<ChangeSet> modifications = consumer.getModifications();
- for ( Iterator i = modifications.iterator(); i.hasNext(); )
+ for ( Iterator<ChangeSet> i = modifications.iterator(); i.hasNext(); )
{
- ChangeSet entry = (ChangeSet) i.next();
+ ChangeSet entry = i.next();
assertEquals( "Mark Struberg <strub...@yahoo.de>",
entry.getAuthor() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java
Sun Jan 9 20:11:26 2011
@@ -43,7 +43,7 @@ public class GitRemoveConsumerTest
consumer.consumeLine( "rm 'project.xml'" );
- List changedFiles = consumer.getRemovedFiles();
+ List<ScmFile> changedFiles = consumer.getRemovedFiles();
assertNotNull( changedFiles );
assertEquals( 1, changedFiles.size() );
@@ -65,7 +65,7 @@ public class GitRemoveConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getRemovedFiles();
+ List<ScmFile> changedFiles = consumer.getRemovedFiles();
assertEquals( 2, changedFiles.size() );
@@ -89,7 +89,7 @@ public class GitRemoveConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getRemovedFiles();
+ List<ScmFile> changedFiles = consumer.getRemovedFiles();
assertEquals( 0, changedFiles.size() );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumerTest.java
Sun Jan 9 20:11:26 2011
@@ -42,7 +42,7 @@ public class GitStatusConsumerTest
consumer.consumeLine( "# new file: project.xml" );
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertNotNull( changedFiles );
assertEquals( 1, changedFiles.size() );
@@ -64,7 +64,7 @@ public class GitStatusConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 2, changedFiles.size() );
@@ -88,7 +88,7 @@ public class GitStatusConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 0, changedFiles.size() );
}
@@ -110,7 +110,7 @@ public class GitStatusConsumerTest
consumer.consumeLine( line );
}
- List changedFiles = consumer.getChangedFiles();
+ List<ScmFile> changedFiles = consumer.getChangedFiles();
assertEquals( 4, changedFiles.size() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java?rev=1057016&r1=1057015&r2=1057016&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumerTest.java
Sun Jan 9 20:11:26 2011
@@ -44,7 +44,7 @@ public class GitUpdateCommandConsumerTes
GitUpdateCommandConsumer consumer = buildGitUpdateCommandConsumer(
"/src/test/resources/git/update/git-update-up-to-date.out" );
- List changedFiles = consumer.getUpdatedFiles();
+ List<ScmFile> changedFiles = consumer.getUpdatedFiles();
assertEquals( 0, changedFiles.size() );
@@ -56,7 +56,7 @@ public class GitUpdateCommandConsumerTes
GitUpdateCommandConsumer consumer = buildGitUpdateCommandConsumer(
"/src/test/resources/git/update/git-update.out" );
- List changedFiles = consumer.getUpdatedFiles();
+ List<ScmFile> changedFiles = consumer.getUpdatedFiles();
assertEquals( 2, changedFiles.size() );
@@ -72,7 +72,7 @@ public class GitUpdateCommandConsumerTes
GitUpdateCommandConsumer consumer = buildGitUpdateCommandConsumer(
"/src/test/resources/git/update/git-update-add-delete.out" );
- List changedFiles = consumer.getUpdatedFiles();
+ List<ScmFile> changedFiles = consumer.getUpdatedFiles();
assertEquals( 3, changedFiles.size() );
@@ -106,7 +106,7 @@ public class GitUpdateCommandConsumerTes
throws Exception
{
GitUpdateCommandConsumer consumer = buildGitUpdateCommandConsumer(
fileName );
- List changedFiles = consumer.getUpdatedFiles();
+ List<ScmFile> changedFiles = consumer.getUpdatedFiles();
assertEquals( 1, changedFiles.size() );
