Author: olamy
Date: Sun Jan 9 15:03:50 2011
New Revision: 1056960
URL: http://svn.apache.org/viewvc?rev=1056960&view=rev
Log:
[SCM-591] Move to Java 1.5 : unedit command
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java
Sun Jan 9 15:03:50 2011
@@ -19,38 +19,41 @@ package org.apache.maven.scm.command.une
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
import java.util.List;
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmResult;
+
/**
+ * @author Olivier Lamy
* @version $Id$
*/
public class UnEditScmResult
extends ScmResult
{
- private List unEditFiles;
+ private static final long serialVersionUID = 257465331122587798L;
+ private List<ScmFile> unEditFiles;
public UnEditScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
- public UnEditScmResult( String commandLine, List unEditFiles )
+ public UnEditScmResult( String commandLine, List<ScmFile> unEditFiles )
{
super( commandLine, null, null, true );
this.unEditFiles = unEditFiles;
}
- public UnEditScmResult( List unEditFiles, ScmResult result )
+ public UnEditScmResult( List<ScmFile> unEditFiles, ScmResult result )
{
super( result );
this.unEditFiles = unEditFiles;
}
- public List getUnEditFiles()
+ public List<ScmFile> getUnEditFiles()
{
return unEditFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditCommand.java
Sun Jan 9 15:03:50 2011
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.cl
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -31,10 +34,9 @@ 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;
-
/**
* @author <a href="mailto:wim.debla...@gmail.com";>Wim Deblauwe</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseUnEditCommand
@@ -95,10 +97,9 @@ public class ClearCaseUnEditCommand
command.createArg().setValue( "unco" );
command.createArg().setValue( "-keep" );
- File[] files = scmFileSet.getFiles();
- for ( int i = 0; i < files.length; i++ )
+ List<File> files = scmFileSet.getFileList();
+ for ( File file : files )
{
- File file = files[i];
command.createArg().setValue( file.getName() );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/unedit/ClearCaseUnEditConsumer.java
Sun Jan 9 15:03:50 2011
@@ -29,6 +29,7 @@ import java.util.List;
/**
* @author <a href="mailto:wim.debla...@gmail.com";>Wim Deblauwe</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class ClearCaseUnEditConsumer
@@ -36,7 +37,7 @@ public class ClearCaseUnEditConsumer
{
private ScmLogger logger;
- private List unEditFiles = new ArrayList();
+ private List<ScmFile> unEditFiles = new ArrayList<ScmFile>();
// ----------------------------------------------------------------------
//
@@ -73,7 +74,7 @@ public class ClearCaseUnEditConsumer
//
// ----------------------------------------------------------------------
- public List getUnEditFiles()
+ public List<ScmFile> getUnEditFiles()
{
return unEditFiles;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditCommand.java
Sun Jan 9 15:03:50 2011
@@ -37,6 +37,7 @@ import java.util.List;
/**
* @author Mike Perham
+ * @author Olivier Lamy
* @version $Id$
*/
public class PerforceUnEditCommand
@@ -89,10 +90,9 @@ public class PerforceUnEditCommand
command.createArg().setValue( "revert" );
- List fs = files.getFileList();
- for ( int i = 0; i < fs.size(); i++ )
+ List<File> fs = files.getFileList();
+ for ( File file : fs )
{
- File file = (File) fs.get( i );
command.createArg().setValue( file.getName() );
}
return command;
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
Sun Jan 9 15:03:50 2011
@@ -19,16 +19,19 @@ package org.apache.maven.scm.provider.pe
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.provider.perforce.command.AbstractPerforceConsumer;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.codehaus.plexus.util.cli.StreamConsumer;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author Mike Perham
+ * @author Olivier Lamy
* @version $Id: PerforceChangeLogConsumer.java 331276 2005-11-07 15:04:54Z
* evenisse $
*/
@@ -45,7 +48,7 @@ public class PerforceUnEditConsumer
private int currentState = STATE_NORMAL;
- private List edits = new ArrayList();
+ private List<ScmFile> edits = new ArrayList<ScmFile>();
private RE revisionRegexp;
@@ -61,7 +64,7 @@ public class PerforceUnEditConsumer
}
}
- public List getEdits()
+ public List<ScmFile> getEdits()
{
return edits;
}
@@ -71,7 +74,7 @@ public class PerforceUnEditConsumer
{
if ( currentState != STATE_ERROR && revisionRegexp.match( line ) )
{
- edits.add( revisionRegexp.getParen( 1 ) );
+ edits.add( new ScmFile(revisionRegexp.getParen( 1 ),
ScmFileStatus.UNKNOWN ) );
return;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditCommand.java
Sun Jan 9 15:03:50 2011
@@ -37,6 +37,7 @@ import java.util.List;
/**
* @author <a href="mailto:dant...@gmail.com";>Dan T. Tran</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamUnEditCommand
@@ -62,7 +63,7 @@ public class StarteamUnEditCommand
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
- List unlockFiles = fileSet.getFileList();
+ List<File> unlockFiles = fileSet.getFileList();
if ( unlockFiles.size() == 0 )
{
@@ -99,7 +100,7 @@ public class StarteamUnEditCommand
public static Commandline createCommandLine( StarteamScmProviderRepository
repo, ScmFileSet dirOrFile )
{
- List args = new ArrayList();
+ List<String> args = new ArrayList<String>();
args.add( "-u" );
return StarteamCommandLineUtils.createStarteamCommandLine( "lck",
args, dirOrFile, repo );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/unedit/StarteamUnEditConsumer.java
Sun Jan 9 15:03:50 2011
@@ -30,6 +30,7 @@ import java.util.List;
/**
* @author <a href="mailto:dant...@apache.org";>Dan T. Tran</a>
+ * @author Olivier Lamy
* @version $Id$
*/
public class StarteamUnEditConsumer
@@ -39,7 +40,7 @@ public class StarteamUnEditConsumer
private ScmLogger logger;
- private List files = new ArrayList();
+ private List<ScmFile> files = new ArrayList<ScmFile>();
/**
* the current directory entry being processed by the parser
@@ -90,7 +91,7 @@ public class StarteamUnEditConsumer
}
}
- public List getUnEditFiles()
+ public List<ScmFile> getUnEditFiles()
{
return files;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java?rev=1056960&r1=1056959&r2=1056960&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/unedit/SynergyUnEditCommand.java
Sun Jan 9 15:03:50 2011
@@ -19,9 +19,16 @@ package org.apache.maven.scm.provider.sy
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
import org.apache.maven.scm.command.unedit.AbstractUnEditCommand;
import org.apache.maven.scm.command.unedit.UnEditScmResult;
@@ -31,10 +38,6 @@ import org.apache.maven.scm.provider.syn
import org.apache.maven.scm.provider.synergy.util.SynergyUtil;
import org.codehaus.plexus.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-
/**
* @author <a href="mailto:julien.he...@capgemini.com";>Julien Henry</a>
* @version $Id$
@@ -71,9 +74,9 @@ public class SynergyUnEditCommand
}
File waPath = SynergyUtil.getWorkArea( getLogger(), projectSpec,
ccmAddr );
File destPath = new File( waPath, repo.getProjectName() );
- for ( Iterator i = fileSet.getFileList().iterator(); i.hasNext(); )
+ for ( Iterator<File> i = fileSet.getFileList().iterator();
i.hasNext(); )
{
- ScmFile f = (ScmFile) i.next();
+ File f = i.next();
File source = new File( fileSet.getBasedir(), f.getPath() );
File dest = new File( destPath, f.getPath() );
SynergyUtil.delete( getLogger(), dest, ccmAddr, true );
@@ -98,8 +101,12 @@ public class SynergyUnEditCommand
{
SynergyUtil.stop( getLogger(), ccmAddr );
}
-
- return new UnEditScmResult( "", fileSet.getFileList() );
+ List<ScmFile> files = new ArrayList<ScmFile>();
+ for (File f : fileSet.getFileList())
+ {
+ files.add( new ScmFile(f.getPath(), ScmFileStatus.UNKNOWN) );
+ }
+ return new UnEditScmResult( "", files );
}
}
