svn commit: r979565 - /archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

[oching]

Author: oching
Date: Tue Jul 27 07:41:11 2010
New Revision: 979565

URL: http://svn.apache.org/viewvc?rev=979565&view=rev
Log:
fixed formatting

Modified:
    
archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

Modified: 
archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=979565&r1=979564&r2=979565&view=diff
==============================================================================
--- 
archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
 (original)
+++ 
archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
 Tue Jul 27 07:41:11 2010
@@ -226,7 +226,6 @@ public class Maven2RepositoryMerger
     private void copyFile( File sourceFile, File targetFile )
         throws IOException
     {
-
         FileOutputStream out = new FileOutputStream( targetFile );
         FileInputStream input = new FileInputStream( sourceFile );
 
@@ -329,27 +328,21 @@ public class Maven2RepositoryMerger
     public List<ArtifactMetadata> getConflictsartifacts( String sourceRepo, 
String targetRepo )
         throws Exception
     {
-
         List<ArtifactMetadata> targetArtifacts = 
metadataRepository.getArtifacts( targetRepo );
         List<ArtifactMetadata> sourceArtifacts = 
metadataRepository.getArtifacts( sourceRepo );
         List<ArtifactMetadata> conflictsArtifacts = new 
ArrayList<ArtifactMetadata>();
 
         for ( ArtifactMetadata targerArtifact : targetArtifacts )
         {
-
             for ( ArtifactMetadata sourceArtifact : sourceArtifacts )
             {
-
                 if ( isEquals( targerArtifact, sourceArtifact ) )
                 {
                     if ( !conflictsArtifacts.contains( sourceArtifact ) )
                     {
                         conflictsArtifacts.add( sourceArtifact );
-
                     }
-
                 }
-
             }
         }