You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2009/09/04 00:44:55 UTC
svn commit: r811161 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer: ChangedFileConsumer.java FileListConsumer.java ServerFileListConsumer.java

Author: olamy
Date: Thu Sep  3 22:44:55 2009
New Revision: 811161

URL: http://svn.apache.org/viewvc?rev=811161&view=rev
Log:
restore 1.4 compatibility.

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ServerFileListConsumer.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java?rev=811161&r1=811160&r2=811161&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ChangedFileConsumer.java Thu Sep  3 22:44:55 2009
@@ -26,6 +26,7 @@
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.log.ScmLogger;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
 public class ChangedFileConsumer
@@ -53,7 +54,7 @@
 
     public void consumeLine( String line )
     {
-        if ( line.contains( ":" ) )
+        if ( line.indexOf( ":" ) >= 0 )
         {
             String[] s = line.split( ":", 2 );
             if ( s.length > 1 )

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java?rev=811161&r1=811160&r2=811161&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/FileListConsumer.java Thu Sep  3 22:44:55 2009
@@ -53,7 +53,7 @@
         {
             currentDir = "";
         }
-        else if ( !currentDir.equals( "" ) && line.contains( " " ) )
+        else if ( !currentDir.equals( "" ) && line.indexOf( " " ) >= 0 )
         {
             String filename = line.split( " " )[1];
             files.add( getScmFile( filename ) );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ServerFileListConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ServerFileListConsumer.java?rev=811161&r1=811160&r2=811161&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ServerFileListConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/consumer/ServerFileListConsumer.java Thu Sep  3 22:44:55 2009
@@ -21,6 +21,7 @@
 
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
+import org.codehaus.plexus.util.StringUtils;
 
 public class ServerFileListConsumer
     extends FileListConsumer
@@ -29,7 +30,8 @@
     {
         if ( filename.startsWith( "$" ) )
         {
-            filename = filename.replace( "$", "" );
+            filename = StringUtils.replace( filename, "$", "", -1 );
+            //filename = filename.replace( "$", "" );
         }
         String path = currentDir + "/" + filename;
         return new ScmFile( path, ScmFileStatus.UNKNOWN );