svn commit: r745835 - /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

[brett]

Author: brett
Date: Thu Feb 19 12:23:49 2009
New Revision: 745835

URL: http://svn.apache.org/viewvc?rev=745835&view=rev
Log:
reformat

Modified:
    
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=745835&r1=745834&r2=745835&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Thu Feb 19 12:23:49 2009
@@ -683,7 +683,8 @@
                 
                 String pass = proxy.getPassword();
                 
-                if( sd != null )
+                if ( sd != null )
+                {
                     try
                     {
                         pass = sd.decrypt( pass );
@@ -692,14 +693,10 @@
                     {
                         throw new SettingsConfigurationException( 
e.getMessage() );
                     }
+                }
 
-                wagonManager.addProxy(   proxy.getProtocol()
-                                       , proxy.getHost()
-                                       , proxy.getPort()
-                                       , proxy.getUsername()
-                                       , pass
-                                       , proxy.getNonProxyHosts()
-                                       );
+                wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), 
proxy.getPort(), proxy.getUsername(),
+                                       pass, proxy.getNonProxyHosts() );
             }
             
             for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
@@ -708,7 +705,8 @@
                 
                 String passWord = server.getPassword();
 
-                if( sd != null )
+                if ( sd != null )
+                {
                     try
                     {
                         passWord = sd.decrypt( passWord );
@@ -717,10 +715,12 @@
                     {
                         throw new SettingsConfigurationException( 
e.getMessage() );
                     }
+                }
                 
                 String passPhrase = server.getPassphrase();
 
-                if( sd != null )
+                if ( sd != null )
+                {
                     try
                     {
                         passPhrase = sd.decrypt( passPhrase );
@@ -729,6 +729,7 @@
                     {
                         throw new SettingsConfigurationException( 
e.getMessage() );
                     }
+                }
 
                 wagonManager.addAuthenticationInfo( server.getId(), 
server.getUsername(), passWord,
                                                     server.getPrivateKey(), 
passPhrase );