From 0167efe972e85689950e602b24ec0c2b91c68ae2 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 29 Nov 2010 00:52:27 +0000 Subject: [PATCH] [MRM-1433] remove @Override are on interface methods which is only possible in java 6 for Java 5 compatibility Submitted by: Jim Sellers git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1039998 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/archiva/consumers/core/MetadataUpdaterConsumer.java | 3 --- .../maven/archiva/consumers/core/ValidateChecksumConsumer.java | 3 --- .../consumers/core/repository/RepositoryPurgeConsumer.java | 3 --- .../apache/archiva/consumers/lucene/NexusIndexerConsumer.java | 3 --- .../converter/legacy/LegacyConverterArtifactConsumer.java | 3 --- .../apache/archiva/repository/scanner/KnownScanConsumer.java | 3 --- .../apache/archiva/repository/scanner/SampleKnownConsumer.java | 3 --- .../org/apache/archiva/scheduler/repository/TestConsumer.java | 3 --- 8 files changed, 24 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java index c8d0ddc0a..0025b0354 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java @@ -142,7 +142,6 @@ public class MetadataUpdaterConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -154,7 +153,6 @@ public class MetadataUpdaterConsumer /* do nothing here */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -189,7 +187,6 @@ public class MetadataUpdaterConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java index 051f8e514..7b4b773fd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java @@ -102,7 +102,6 @@ public class ValidateChecksumConsumer this.repositoryDir = new File( repository.getLocation() ); } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -114,7 +113,6 @@ public class ValidateChecksumConsumer /* nothing to do */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -156,7 +154,6 @@ public class ValidateChecksumConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index a77507cf7..ecc845991 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -157,7 +157,6 @@ public class RepositoryPurgeConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -182,7 +181,6 @@ public class RepositoryPurgeConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -194,7 +192,6 @@ public class RepositoryPurgeConsumer /* do nothing */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java index 5e1f1ee9c..10965bf39 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java @@ -112,7 +112,6 @@ public class NexusIndexerConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -145,7 +144,6 @@ public class NexusIndexerConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -188,7 +186,6 @@ public class NexusIndexerConsumer context = null; } - @Override public void completeScan( boolean executeOnEntireRepo ) { if( executeOnEntireRepo ) diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java index df75dde2f..dd03c4a34 100644 --- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java +++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java @@ -88,7 +88,6 @@ public class LegacyConverterArtifactConsumer this.managedRepository.setRepository( repository ); } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -100,7 +99,6 @@ public class LegacyConverterArtifactConsumer } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -137,7 +135,6 @@ public class LegacyConverterArtifactConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java index 6be497eb1..a2cd92901 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java @@ -76,7 +76,6 @@ public class KnownScanConsumer /* do nothing */ } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -89,7 +88,6 @@ public class KnownScanConsumer this.processCount++; } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -101,7 +99,6 @@ public class KnownScanConsumer /* do nothing */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java index 0465d5e70..086f0436f 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java @@ -50,7 +50,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -62,7 +61,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); @@ -84,7 +82,6 @@ public class SampleKnownConsumer /* nothing to do */ } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java index 328450c95..b32fd6a1f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java @@ -87,7 +87,6 @@ public class TestConsumer } } - @Override public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo ) throws ConsumerException { @@ -110,7 +109,6 @@ public class TestConsumer } } - @Override public void processFile( String path, boolean executeOnEntireRepo ) throws Exception { @@ -121,7 +119,6 @@ public class TestConsumer { } - @Override public void completeScan( boolean executeOnEntireRepo ) { completeScan(); -- 2.39.5