Author: mperham
Date: Thu Jun 15 11:47:02 2006
New Revision: 414653
URL: http://svn.apache.org/viewvc?rev=414653&view=rev
Log:
Clean up all IDEA code warnings
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.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/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.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/PerforceScmProvider.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/PerforceScmProvider.java
Thu Jun 15 11:47:02 2006
@@ -241,6 +241,10 @@
Commandline command = new Commandline();
command.setExecutable( "p4" );
command.setWorkingDirectory( workingDir.getAbsolutePath() );
+
+ // SCM-209
+// command.createArgument().setValue("-d");
+// command.createArgument().setValue(workingDir.getAbsolutePath());
if ( repo.getHost() != null )
{
@@ -320,14 +324,19 @@
Created by maven-scm-provider-perforce
*/
- public static String createClientspec( PerforceScmProviderRepository repo,
String specname, File workDir )
+ public static String createClientspec(PerforceScmProviderRepository repo,
File workDir)
{
String clientspecName = getClientspecName( repo, workDir );
String userName = getUsername( repo );
- String rootDir = null;
- try {
+
+ String rootDir;
+ try
+ {
+ // SCM-184
rootDir = workDir.getCanonicalPath();
- } catch (IOException ex) {
+ }
+ catch (IOException ex)
+ {
//getLogger().error("Error getting canonical path for working
directory: " + workDir, ex);
rootDir = workDir.getAbsolutePath();
}
@@ -348,16 +357,14 @@
public static String getClientspecName( PerforceScmProviderRepository
repo, File workDir )
{
- String clientspecName =
- System.getProperty( DEFAULT_CLIENTSPEC_PROPERTY,
generateDefaultClientspecName( repo, workDir ) );
- return clientspecName;
+ return System.getProperty( DEFAULT_CLIENTSPEC_PROPERTY,
generateDefaultClientspecName( repo, workDir ) );
}
private static String generateDefaultClientspecName(
PerforceScmProviderRepository repo, File workDir )
{
String username = getUsername( repo );
- String hostname = "nohost";
- String path = "nopath";
+ String hostname;
+ String path;
try
{
hostname = InetAddress.getLocalHost().getHostName();
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.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/add/PerforceAddCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/add/PerforceAddCommand.java
Thu Jun 15 11:47:02 2006
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.List;
/**
* @author Mike Perham
@@ -53,7 +54,7 @@
{
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
consumer.consumeLine( line );
@@ -75,32 +76,12 @@
ScmFileSet files )
{
Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
-
command.createArgument().setValue( "add" );
- try
- {
- String candir = workingDirectory.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
- {
- File file = fs[i];
- // I want to use relative paths to add files to make testing
- // simpler.
- // Otherwise the absolute path will be different on everyone's
- // machine
- // and testing will be a little more painful.
- String canfile = file.getCanonicalPath();
- if ( canfile.startsWith( candir ) )
- {
- canfile = canfile.substring( candir.length() + 1 );
- }
- command.createArgument().setValue( file.getName() );
- }
- }
- catch ( IOException e )
- {
- e.printStackTrace();
+ List fs = files.getFileList();
+ for (int i = 0; i < fs.size(); i++) {
+ File file = (File) fs.get(i);
+ command.createArgument().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/checkin/PerforceCheckInCommand.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/checkin/PerforceCheckInCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommand.java
Thu Jun 15 11:47:02 2006
@@ -35,6 +35,7 @@
import java.io.OutputStream;
import java.util.HashSet;
import java.util.Set;
+import java.util.List;
/**
* @author Mike Perham
@@ -50,7 +51,7 @@
String something )
throws ScmException
{
- Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir(), files );
+ Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir());
PerforceCheckInConsumer consumer = new PerforceCheckInConsumer();
try
{
@@ -64,7 +65,7 @@
dos.close();
out.close();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
@@ -84,8 +85,7 @@
consumer.getOutput(),
consumer.isSuccess() );
}
- public static Commandline createCommandLine( PerforceScmProviderRepository
repo, File workingDirectory,
- ScmFileSet files )
+ public static Commandline createCommandLine(PerforceScmProviderRepository
repo, File workingDirectory)
{
Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
@@ -108,10 +108,10 @@
Set dupes = new HashSet();
File workingDir = files.getBasedir();
String candir = workingDir.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
+ List fs = files.getFileList();
+ for ( int i = 0; i < fs.size(); i++ )
{
- File file = fs[i];
+ File file = (File) fs.get(i);
// XXX Submit requires the canonical repository path for each
// file.
// It is unclear how to get that from a File object.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.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/checkout/PerforceCheckOutCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java
Thu Jun 15 11:47:02 2006
@@ -79,7 +79,7 @@
// Write clientspec to STDIN
OutputStream out = proc.getOutputStream();
DataOutputStream dos = new DataOutputStream( out );
- String client = PerforceScmProvider.createClientspec( prepo,
specname, workingDirectory );
+ String client = PerforceScmProvider.createClientspec( prepo,
workingDirectory );
getLogger().debug( "Updating clientspec:\n" + client );
dos.write( client.getBytes() );
dos.close();
@@ -87,7 +87,7 @@
// Read result from STDOUT
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
@@ -116,7 +116,7 @@
getLogger().debug( "Executing: " +
PerforceScmProvider.clean( cl.toString() ) );
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new
InputStreamReader( proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
@@ -162,7 +162,7 @@
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new
InputStreamReader( proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.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/diff/PerforceDiffCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommand.java
Thu Jun 15 11:47:02 2006
@@ -54,7 +54,7 @@
{
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
consumer.consumeLine( line );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.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/edit/PerforceEditCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/edit/PerforceEditCommand.java
Thu Jun 15 11:47:02 2006
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.List;
/**
* @author Mike Perham
@@ -53,7 +54,7 @@
getLogger().debug( PerforceScmProvider.clean( "Executing " +
cl.toString() ) );
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
consumer.consumeLine( line );
@@ -81,10 +82,10 @@
try
{
String candir = workingDirectory.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
+ List fs = files.getFileList();
+ for ( int i = 0; i < fs.size(); i++ )
{
- File file = fs[i];
+ File file = (File) fs.get(i);
// I want to use relative paths to add files to make testing
// simpler.
// Otherwise the absolute path will be different on everyone's
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.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/login/PerforceLoginCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommand.java
Thu Jun 15 11:47:02 2006
@@ -42,7 +42,7 @@
public LoginScmResult executeLoginCommand( ScmProviderRepository repo,
ScmFileSet files, CommandParameters params )
throws ScmException
{
- Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir(), params );
+ Commandline cl = createCommandLine( (PerforceScmProviderRepository)
repo, files.getBasedir() );
PerforceLoginConsumer consumer = new PerforceLoginConsumer();
// In Perforce the user logs in once and then has a ticket good for 12
hours.
// We assume the user has logged in already so we don't have to deal
with
@@ -73,8 +73,7 @@
.getOutput(), consumer.isSuccess() );
}
- public static Commandline createCommandLine( PerforceScmProviderRepository
repo, File workingDir,
- CommandParameters params )
+ public static Commandline createCommandLine( PerforceScmProviderRepository
repo, File workingDir )
{
Commandline command = PerforceScmProvider.createP4Command( repo,
workingDir );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.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/remove/PerforceRemoveCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/remove/PerforceRemoveCommand.java
Thu Jun 15 11:47:02 2006
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.List;
/**
* @author Mike Perham
@@ -52,7 +53,7 @@
{
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
consumer.consumeLine( line );
@@ -74,32 +75,13 @@
ScmFileSet files )
{
Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
-
command.createArgument().setValue( "delete" );
- try
- {
- String candir = workingDirectory.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
- {
- File file = fs[i];
- // I want to use relative paths to delete files to make testing
- // simpler.
- // Otherwise the absolute path will be different on everyone's
- // machine
- // and testing will be a little more painful.
- String canfile = file.getCanonicalPath();
- if ( canfile.startsWith( candir ) )
- {
- canfile = canfile.substring( candir.length() + 1 );
- }
- command.createArgument().setValue( file.getName() );
- }
- }
- catch ( IOException e )
+ List fs = files.getFileList();
+ for ( int i = 0; i < fs.size(); i++ )
{
- e.printStackTrace();
+ File file = (File) fs.get( i );
+ command.createArgument().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/status/PerforceStatusCommand.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/status/PerforceStatusCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommand.java
Thu Jun 15 11:47:02 2006
@@ -71,7 +71,6 @@
{
List results = new ArrayList();
List files = consumer.getDepotfiles();
- String root = repoPath;
RE re = new RE( "([^#]+)#\\d+ - ([^ ]+) .*" );
for ( Iterator it = files.iterator(); it.hasNext(); )
{
@@ -84,7 +83,7 @@
String path = re.getParen( 1 );
String verb = re.getParen( 2 );
- ScmFile scmfile = new ScmFile( path.substring( root.length() + 1
).trim(), PerforceVerbMapper
+ ScmFile scmfile = new ScmFile( path.substring( repoPath.length() +
1 ).trim(), PerforceVerbMapper
.toStatus( verb ) );
results.add( scmfile );
}
@@ -100,7 +99,7 @@
getLogger().debug( PerforceScmProvider.clean( "Executing " +
cl.toString() ) );
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Reading " + line );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.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/tag/PerforceTagCommand.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java
Thu Jun 15 11:47:02 2006
@@ -34,6 +34,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.util.List;
/**
* @author Mike Perham
@@ -76,7 +77,7 @@
getLogger().debug( PerforceScmProvider.clean( "Executing: " +
cl.toString() ) );
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
@@ -95,19 +96,19 @@
private void createLabel( ScmProviderRepository repo, ScmFileSet files,
String tag, PerforceTagConsumer consumer )
{
- Commandline cl = createLabelCommandLine(
(PerforceScmProviderRepository) repo, files.getBasedir(), files, tag );
+ Commandline cl = createLabelCommandLine(
(PerforceScmProviderRepository) repo, files.getBasedir() );
try
{
getLogger().debug( PerforceScmProvider.clean( "Executing: " +
cl.toString() ) );
Process proc = cl.execute();
OutputStream out = proc.getOutputStream();
DataOutputStream dos = new DataOutputStream( out );
- String label = createLabelSpecification(
(PerforceScmProviderRepository) repo, files, tag );
+ String label = createLabelSpecification(
(PerforceScmProviderRepository) repo, tag );
dos.write( label.getBytes() );
dos.close();
out.close();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
getLogger().debug( "Consuming: " + line );
@@ -124,8 +125,7 @@
}
}
- public static Commandline createLabelCommandLine(
PerforceScmProviderRepository repo, File workingDirectory,
- ScmFileSet files, String
tag )
+ public static Commandline createLabelCommandLine(
PerforceScmProviderRepository repo, File workingDirectory )
{
Commandline command = PerforceScmProvider.createP4Command( repo,
workingDirectory );
@@ -143,29 +143,11 @@
command.createArgument().setValue( "-l" );
command.createArgument().setValue( tag );
- try
- {
- String candir = workingDirectory.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
- {
- File file = fs[i];
- // I want to use relative paths to add files to make testing
- // simpler.
- // Otherwise the absolute path will be different on everyone's
- // machine
- // and testing will be a little more painful.
- String canfile = file.getCanonicalPath();
- if ( canfile.startsWith( candir ) )
- {
- canfile = canfile.substring( candir.length() + 1 );
- }
- command.createArgument().setValue( file.getName() );
- }
- }
- catch ( IOException e )
+ List fs = files.getFileList();
+ for ( int i = 0; i < fs.size(); i++ )
{
- e.printStackTrace();
+ File file = (File) fs.get(i);
+ command.createArgument().setValue( file.getName() );
}
return command;
}
@@ -176,7 +158,7 @@
* Label: foo-label
* View: //depot/path/to/repos/...
*/
- public static String createLabelSpecification(
PerforceScmProviderRepository repo, ScmFileSet files, String tag )
+ public static String createLabelSpecification(
PerforceScmProviderRepository repo, String tag )
{
StringBuffer buf = new StringBuffer();
buf.append( "Label: " ).append( tag ).append( NEWLINE );
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=414653&r1=414652&r2=414653&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
Thu Jun 15 11:47:02 2006
@@ -32,6 +32,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.List;
/**
* @author Mike Perham
@@ -52,7 +53,7 @@
{
Process proc = cl.execute();
BufferedReader br = new BufferedReader( new InputStreamReader(
proc.getInputStream() ) );
- String line = null;
+ String line;
while ( ( line = br.readLine() ) != null )
{
consumer.consumeLine( line );
@@ -84,29 +85,11 @@
command.createArgument().setValue( "revert" );
- try
+ List fs = files.getFileList();
+ for ( int i = 0; i < fs.size(); i++ )
{
- String candir = workingDirectory.getCanonicalPath();
- File[] fs = files.getFiles();
- for ( int i = 0; i < fs.length; i++ )
- {
- File file = fs[i];
- // I want to use relative paths to add files to make testing
- // simpler.
- // Otherwise the absolute path will be different on everyone's
- // machine
- // and testing will be a little more painful.
- String canfile = file.getCanonicalPath();
- if ( canfile.startsWith( candir ) )
- {
- canfile = canfile.substring( candir.length() + 1 );
- }
- command.createArgument().setValue( file.getName() );
- }
- }
- catch ( IOException e )
- {
- e.printStackTrace();
+ File file = (File) fs.get( i );
+ command.createArgument().setValue( file.getName() );
}
return command;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkin/PerforceCheckInCommandTest.java
Thu Jun 15 11:47:02 2006
@@ -64,7 +64,7 @@
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository.getProviderRepository();
ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
- Commandline cl = PerforceCheckInCommand.createCommandLine(
svnRepository, workingDirectory, files );
+ Commandline cl = PerforceCheckInCommand.createCommandLine(
svnRepository, workingDirectory);
assertEquals( commandLine, cl.toString() );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
Thu Jun 15 11:47:02 2006
@@ -51,7 +51,7 @@
PerforceScmProviderRepository svnRepository =
(PerforceScmProviderRepository) repository
.getProviderRepository();
CommandParameters params = new CommandParameters();
- Commandline cl = PerforceLoginCommand.createCommandLine(
svnRepository, workingDirectory, params );
+ Commandline cl = PerforceLoginCommand.createCommandLine(
svnRepository, workingDirectory );
assertEquals( commandLine, cl.toString() );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java?rev=414653&r1=414652&r2=414653&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommandTest.java
Thu Jun 15 11:47:02 2006
@@ -53,7 +53,7 @@
.getProviderRepository();
ScmFileSet files = new ScmFileSet( new File( "." ), new File[]{new
File( "foo.xml" ), new File( "bar.xml" )} );
- Commandline cl1 = PerforceTagCommand.createLabelCommandLine(
svnRepository, workingDirectory, files, tag );
+ Commandline cl1 = PerforceTagCommand.createLabelCommandLine(
svnRepository, workingDirectory );
assertEquals( create, cl1.toString() );
Commandline cl2 = PerforceTagCommand.createLabelsyncCommandLine(
svnRepository, workingDirectory, files, tag );
assertEquals( sync, cl2.toString() );
