svn commit: r357054 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java

[dantran]

Author: dantran
Date: Thu Dec 15 10:33:58 2005
New Revision: 357054

URL: http://svn.apache.org/viewcvs?rev=357054&view=rev
Log:

PR: SCM-108
Submitted by: Wim Deblauwe

Replace jdk 1.5 call with 1.4

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
URL: 
http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java?rev=357054&r1=357053&r2=357054&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/repository/ClearCaseScmProviderRepository.java
 Thu Dec 15 10:33:58 2005
@@ -20,10 +20,11 @@
 import org.apache.maven.scm.repository.ScmRepositoryException;
 
 import java.io.File;
+import java.net.InetAddress;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.StringTokenizer;
 
@@ -35,11 +36,12 @@
     extends ScmProviderRepository
 {
     private boolean viewNameGivenByUser = false;
+
     private String viewName;
+
     private File configSpec;
 
     /**
-     *
      * @param url format is [view_name]:[url_to_configspec] or 
[view_name]|[url_to_configspec]
      */
     public ClearCaseScmProviderRepository( String url )
@@ -66,7 +68,7 @@
     private void parseUrl( String url )
         throws MalformedURLException, URISyntaxException, UnknownHostException
     {
-        if( url.indexOf( '|' ) != -1 )
+        if ( url.indexOf( '|' ) != -1 )
         {
             StringTokenizer tokenizer = new StringTokenizer( url, "|" );
             fillInProperties( tokenizer );
@@ -81,9 +83,9 @@
     private void fillInProperties( StringTokenizer tokenizer )
         throws UnknownHostException, URISyntaxException, MalformedURLException
     {
-        if( tokenizer.countTokens() == 1 )
+        if ( tokenizer.countTokens() == 1 )
         {
-           //No view name was given
+            //No view name was given
             viewName = getDefaultViewName();
             String spec = tokenizer.nextToken();
             System.out.println( "spec = " + spec );
@@ -104,20 +106,21 @@
         throws URISyntaxException, MalformedURLException
     {
         File result;
-        if( spec.indexOf( ':' ) == -1 )
+        if ( spec.indexOf( ':' ) == -1 )
         {
             result = new File( spec );
         }
         else
         {
-            result = new File( new URL( spec ).toURI() );
+            result = new File( new URI( new URL( spec ).toString() ) );
         }
         return result;
     }
 
     /**
      * Default: ${hostname}-{user.name}-maven
-     * @return
+     *
+     * @return the default view name
      */
     private String getDefaultViewName()
         throws UnknownHostException
@@ -136,13 +139,14 @@
     /**
      * Returns the name of the view. If it is defined in the scm url, then it 
is returned as defined there.
      * If it is the default name, then the uniqueId is added
+     *
      * @param uniqueId
      * @return the name of the view
      */
     public String getViewName( String uniqueId )
     {
         String result;
-        if( viewNameGivenByUser )
+        if ( viewNameGivenByUser )
         {
             result = viewName;
         }