Author: olamy
Date: Wed Jan 26 21:58:10 2011
New Revision: 1063885
URL: http://svn.apache.org/viewvc?rev=1063885&view=rev
Log:
use new InfoItem class
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/info/SvnInfoCommand.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/info/SvnInfoConsumer.java
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/info/SvnInfoCommand.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/info/SvnInfoCommand.java?rev=1063885&r1=1063884&r2=1063885&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/info/SvnInfoCommand.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/info/SvnInfoCommand.java
Wed Jan 26 21:58:10 2011
@@ -19,14 +19,17 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+
import org.apache.maven.scm.CommandParameters;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.AbstractCommand;
+import org.apache.maven.scm.command.info.InfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.command.SvnCommand;
-import org.apache.maven.scm.provider.svn.command.info.SvnInfoScmResult;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.provider.svn.svnexe.command.SvnCommandLineUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -34,9 +37,6 @@ import org.codehaus.plexus.util.cli.Comm
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.util.Iterator;
-
/**
* @author <a href="mailto:[email protected]";>Kenney Westerhof</a>
* @version $Id$
@@ -54,7 +54,7 @@ public class SvnInfoCommand
return executeInfoCommand( (SvnScmProviderRepository) repository,
fileSet, parameters, false, null );
}
- public SvnInfoScmResult executeInfoCommand( SvnScmProviderRepository
repository, ScmFileSet fileSet,
+ public InfoScmResult executeInfoCommand( SvnScmProviderRepository
repository, ScmFileSet fileSet,
CommandParameters parameters,
boolean recursive, String revision )
throws ScmException
{
@@ -83,10 +83,10 @@ public class SvnInfoCommand
if ( exitCode != 0 )
{
- return new SvnInfoScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
+ return new InfoScmResult( cl.toString(), "The svn command
failed.", stderr.getOutput(), false );
}
- return new SvnInfoScmResult( cl.toString(), consumer.getInfoItems() );
+ return new InfoScmResult( cl.toString(), consumer.getInfoItems() );
}
//set scope to protected to allow test to call it directly
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/info/SvnInfoConsumer.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/info/SvnInfoConsumer.java?rev=1063885&r1=1063884&r2=1063885&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/info/SvnInfoConsumer.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/info/SvnInfoConsumer.java
Wed Jan 26 21:58:10 2011
@@ -19,12 +19,12 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
-import org.apache.maven.scm.provider.svn.command.info.SvnInfoItem;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.command.info.InfoItem;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
/**
* @author <a href="mailto:[email protected]";>Kenney Westerhof</a>
* @version $Id$
@@ -32,9 +32,9 @@ import java.util.List;
public class SvnInfoConsumer
implements StreamConsumer
{
- private List<SvnInfoItem> infoItems = new ArrayList<SvnInfoItem>();
+ private List<InfoItem> infoItems = new ArrayList<InfoItem>();
- private SvnInfoItem currentItem = new SvnInfoItem();
+ private InfoItem currentItem = new InfoItem();
/** {@inheritDoc} */
public void consumeLine( String s )
@@ -46,7 +46,7 @@ public class SvnInfoConsumer
infoItems.add( currentItem );
}
- currentItem = new SvnInfoItem();
+ currentItem = new InfoItem();
}
else if ( s.startsWith( "Path: " ) )
{
@@ -105,7 +105,7 @@ public class SvnInfoConsumer
}
}
- public List<SvnInfoItem> getInfoItems()
+ public List<InfoItem> getInfoItems()
{
return infoItems;
}
