svn commit: r1073703 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java

[bentmann]

Author: bentmann
Date: Wed Feb 23 11:47:12 2011
New Revision: 1073703

URL: http://svn.apache.org/viewvc?rev=1073703&view=rev
Log:
o Refactored code

Modified:
    
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java

Modified: 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java?rev=1073703&r1=1073702&r2=1073703&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
 Wed Feb 23 11:47:12 2011
@@ -461,17 +461,7 @@ public class LegacyRepositorySystem
             for ( ArtifactRepository repository : repositories )
             {
                 Mirror mirror = getMirror( repository, mirrors );
-
-                if ( mirror != null )
-                {
-                    repository.setId( mirror.getId() );
-                    repository.setUrl( mirror.getUrl() );
-
-                    if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
-                    {
-                        repository.setLayout( getLayout( mirror.getLayout() ) 
);
-                    }
-                }
+                injectMirror( repository, mirror );
             }
         }
     }
@@ -504,17 +494,21 @@ public class LegacyRepositorySystem
             for ( ArtifactRepository repository : repositories )
             {
                 Mirror mirror = getMirror( session, repository );
+                injectMirror( repository, mirror );
+            }
+        }
+    }
 
-                if ( mirror != null )
-                {
-                    repository.setId( mirror.getId() );
-                    repository.setUrl( mirror.getUrl() );
+    private void injectMirror( ArtifactRepository repository, Mirror mirror )
+    {
+        if ( mirror != null )
+        {
+            repository.setId( mirror.getId() );
+            repository.setUrl( mirror.getUrl() );
 
-                    if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
-                    {
-                        repository.setLayout( getLayout( mirror.getLayout() ) 
);
-                    }
-                }
+            if ( StringUtils.isNotEmpty( mirror.getLayout() ) )
+            {
+                repository.setLayout( getLayout( mirror.getLayout() ) );
             }
         }
     }