From 061c2e548fe3f69e31d0790affdaa6e06327e3ec Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Tue, 27 Jul 2010 07:41:11 +0000 Subject: [PATCH] fixed formatting git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979565 13f79535-47bb-0310-9956-ffa450edef68 --- .../stagerepository/merge/Maven2RepositoryMerger.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java index ca71277e6..7b8fe7b86 100644 --- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java @@ -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 getConflictsartifacts( String sourceRepo, String targetRepo ) throws Exception { - List targetArtifacts = metadataRepository.getArtifacts( targetRepo ); List sourceArtifacts = metadataRepository.getArtifacts( sourceRepo ); List conflictsArtifacts = new ArrayList(); for ( ArtifactMetadata targerArtifact : targetArtifacts ) { - for ( ArtifactMetadata sourceArtifact : sourceArtifacts ) { - if ( isEquals( targerArtifact, sourceArtifact ) ) { if ( !conflictsArtifacts.contains( sourceArtifact ) ) { conflictsArtifacts.add( sourceArtifact ); - } - } - } } -- 2.39.5