svn commit: r540609 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java

[evenisse]

Author: evenisse
Date: Tue May 22 08:26:36 2007
New Revision: 540609

URL: http://svn.apache.org/viewvc?view=rev&rev=540609
Log:
[MRELEASE-234] Remove java5 code

Modified:
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?view=diff&rev=540609&r1=540608&r2=540609
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
 Tue May 22 08:26:36 2007
@@ -26,6 +26,7 @@
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.scm.ScmTranslator;
+import org.codehaus.plexus.util.StringUtils;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
@@ -251,14 +252,13 @@
         }
         // If there is nothing common between trunk and tags, or the relative
         // path does not exist in the url, then just return the tag.
-        if ( i == 0 || !urlPath.contains( trunkPath.substring( i ) ) )
+        if ( i == 0 || urlPath.indexOf( trunkPath.substring( i ) ) < 0 )
         {
             return tagPath;
         }
         else
         {
-            return urlPath.replace( trunkPath.substring( i ), 
tagPath.substring( i ) );
+            return StringUtils.replace( urlPath, trunkPath.substring( i ), 
tagPath.substring( i ) );
         }
-
     }
 }