From 99117364be2b27ddb74fc6ffe3e052e0ad52d8dd Mon Sep 17 00:00:00 2001 From: Eric Barboni Date: Fri, 11 Apr 2014 23:46:35 +0200 Subject: one move for all remaining override annotation --- .../archiva/configuration/DefaultArchivaConfiguration.java | 9 +++++++++ .../main/java/org/apache/archiva/configuration/FileTypes.java | 2 ++ .../configuration/functors/FiletypeSelectionPredicate.java | 1 + .../archiva/configuration/functors/FiletypeToMapClosure.java | 1 + .../archiva/configuration/functors/NetworkProxyComparator.java | 1 + .../configuration/functors/NetworkProxySelectionPredicate.java | 1 + .../functors/ProxyConnectorConfigurationOrderComparator.java | 1 + .../configuration/functors/ProxyConnectorSelectionPredicate.java | 1 + .../functors/RepositoryConfigurationComparator.java | 1 + .../apache/archiva/configuration/ArchivaConfigurationTest.java | 1 + 10 files changed, 19 insertions(+) (limited to 'archiva-modules/archiva-base/archiva-configuration') diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index 21bcdd096..bea3eff64 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -162,6 +162,7 @@ public class DefaultArchivaConfiguration private static final String KEY = "org.apache.archiva"; + @Override public Configuration getConfiguration() { return loadConfiguration(); @@ -441,6 +442,7 @@ public class DefaultArchivaConfiguration } @SuppressWarnings ( "unchecked" ) + @Override public synchronized void save( Configuration configuration ) throws IndeterminateConfigurationException, RegistryException { @@ -627,6 +629,7 @@ public class DefaultArchivaConfiguration } } + @Override public void addListener( ConfigurationListener listener ) { if ( listener == null ) @@ -637,6 +640,7 @@ public class DefaultArchivaConfiguration listeners.add( listener ); } + @Override public void removeListener( ConfigurationListener listener ) { if ( listener == null ) @@ -647,6 +651,7 @@ public class DefaultArchivaConfiguration listeners.remove( listener ); } + @Override public void addChangeListener( RegistryListener listener ) { addRegistryChangeListener( listener ); @@ -760,6 +765,7 @@ public class DefaultArchivaConfiguration //save( configuration ); } + @Override public void reload() { this.configuration = null; @@ -774,11 +780,13 @@ public class DefaultArchivaConfiguration this.initialize(); } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { // nothing to do here } + @Override public synchronized void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { configuration = null; @@ -845,6 +853,7 @@ public class DefaultArchivaConfiguration return altConfigFilename; } + @Override public boolean isDefaulted() { return this.isConfigurationDefaulted; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java index f0ad020c7..96a551bcf 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java @@ -230,6 +230,7 @@ public class FileTypes } } + @Override public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { if ( propertyName.contains( "fileType" ) ) @@ -240,6 +241,7 @@ public class FileTypes } } + @Override public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue ) { /* nothing to do */ diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java index e9ba6a57e..ce3d93a52 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeSelectionPredicate.java @@ -38,6 +38,7 @@ public class FiletypeSelectionPredicate this.filetypeId = id; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java index bf1637607..8d79937f1 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/FiletypeToMapClosure.java @@ -35,6 +35,7 @@ public class FiletypeToMapClosure { private Map map = new HashMap<>(); + @Override public void execute( Object input ) { if ( input instanceof FileType ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java index de5f1148d..d71e32316 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxyComparator.java @@ -31,6 +31,7 @@ import java.util.Comparator; public class NetworkProxyComparator implements Comparator { + @Override public int compare( NetworkProxyConfiguration o1, NetworkProxyConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java index 822775a4b..f3bd35bd5 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/NetworkProxySelectionPredicate.java @@ -38,6 +38,7 @@ public class NetworkProxySelectionPredicate this.proxyId = id; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java index 1fc9e7d4e..5643031eb 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java @@ -33,6 +33,7 @@ public class ProxyConnectorConfigurationOrderComparator private static ProxyConnectorConfigurationOrderComparator INSTANCE = new ProxyConnectorConfigurationOrderComparator(); + @Override public int compare( ProxyConnectorConfiguration o1, ProxyConnectorConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java index eaa97fb9b..aec7c902f 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java @@ -41,6 +41,7 @@ public class ProxyConnectorSelectionPredicate this.targetId = targetId; } + @Override public boolean evaluate( Object object ) { boolean satisfies = false; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java index ddebce25f..9e2b64e22 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/RepositoryConfigurationComparator.java @@ -31,6 +31,7 @@ import java.util.Comparator; public class RepositoryConfigurationComparator implements Comparator { + @Override public int compare( AbstractRepositoryConfiguration o1, AbstractRepositoryConfiguration o2 ) { if ( o1 == null && o2 == null ) diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index f9b081f3d..03bb489b2 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -702,6 +702,7 @@ public class ArchivaConfigurationTest // etc. as it's done in other tests archivaConfiguration.addListener( new ConfigurationListener() { + @Override public void configurationEvent( ConfigurationEvent event ) { assertEquals( ConfigurationEvent.SAVED, event.getType() ); -- cgit v1.2.3