diff --git a/briar-android/src/net/sf/briar/android/AndroidModule.java b/briar-android/src/net/sf/briar/android/AndroidModule.java index ee700f820..06dbc4bcf 100644 --- a/briar-android/src/net/sf/briar/android/AndroidModule.java +++ b/briar-android/src/net/sf/briar/android/AndroidModule.java @@ -34,7 +34,6 @@ import com.google.inject.Singleton; public class AndroidModule extends AbstractModule { - @Override protected void configure() { bind(AndroidExecutor.class).to(AndroidExecutorImpl.class); bind(ReferenceManager.class).to(ReferenceManagerImpl.class).in( diff --git a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java index 1880ece37..3f074576e 100644 --- a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java +++ b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldModule.java @@ -14,7 +14,6 @@ import com.google.inject.Singleton; public class HelloWorldModule extends AbstractModule { - @Override protected void configure() { bind(UiCallback.class).toInstance(new UiCallback() { diff --git a/briar-core/src/net/sf/briar/clock/ClockModule.java b/briar-core/src/net/sf/briar/clock/ClockModule.java index 8bf9a3816..f3c1d921b 100644 --- a/briar-core/src/net/sf/briar/clock/ClockModule.java +++ b/briar-core/src/net/sf/briar/clock/ClockModule.java @@ -9,7 +9,6 @@ import com.google.inject.AbstractModule; public class ClockModule extends AbstractModule { - @Override protected void configure() { bind(Clock.class).to(SystemClock.class); bind(Timer.class).to(SystemTimer.class); diff --git a/briar-core/src/net/sf/briar/crypto/CryptoModule.java b/briar-core/src/net/sf/briar/crypto/CryptoModule.java index 00457ed92..288007a9d 100644 --- a/briar-core/src/net/sf/briar/crypto/CryptoModule.java +++ b/briar-core/src/net/sf/briar/crypto/CryptoModule.java @@ -36,7 +36,6 @@ public class CryptoModule extends AbstractModule { 60, SECONDS, queue, policy); } - @Override protected void configure() { bind(CryptoComponent.class).to( CryptoComponentImpl.class).in(Singleton.class); diff --git a/briar-core/src/net/sf/briar/db/DatabaseModule.java b/briar-core/src/net/sf/briar/db/DatabaseModule.java index 50db20668..eb625c951 100644 --- a/briar-core/src/net/sf/briar/db/DatabaseModule.java +++ b/briar-core/src/net/sf/briar/db/DatabaseModule.java @@ -40,7 +40,6 @@ public class DatabaseModule extends AbstractModule { 60, SECONDS, queue, policy); } - @Override protected void configure() { bind(DatabaseCleaner.class).to(DatabaseCleanerImpl.class); } diff --git a/briar-core/src/net/sf/briar/invitation/InvitationModule.java b/briar-core/src/net/sf/briar/invitation/InvitationModule.java index b2e476572..4c5293fb1 100644 --- a/briar-core/src/net/sf/briar/invitation/InvitationModule.java +++ b/briar-core/src/net/sf/briar/invitation/InvitationModule.java @@ -7,9 +7,8 @@ import com.google.inject.Singleton; public class InvitationModule extends AbstractModule { - @Override protected void configure() { - bind(InvitationTaskFactory.class).to(InvitationTaskFactoryImpl.class).in( - Singleton.class); + bind(InvitationTaskFactory.class).to( + InvitationTaskFactoryImpl.class).in(Singleton.class); } } diff --git a/briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java b/briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java index f4b214dea..d1b5c2b5c 100644 --- a/briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java +++ b/briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java @@ -9,10 +9,9 @@ import com.google.inject.Singleton; public class LifecycleModule extends AbstractModule { - @Override protected void configure() { - bind(LifecycleManager.class).to(LifecycleManagerImpl.class).in( - Singleton.class); + bind(LifecycleManager.class).to( + LifecycleManagerImpl.class).in(Singleton.class); if(OsUtils.isWindows()) bind(ShutdownManager.class).to(WindowsShutdownManagerImpl.class); else bind(ShutdownManager.class).to(ShutdownManagerImpl.class); diff --git a/briar-core/src/net/sf/briar/messaging/MessagingModule.java b/briar-core/src/net/sf/briar/messaging/MessagingModule.java index a92c75e45..44b157455 100644 --- a/briar-core/src/net/sf/briar/messaging/MessagingModule.java +++ b/briar-core/src/net/sf/briar/messaging/MessagingModule.java @@ -18,7 +18,6 @@ import com.google.inject.Provides; public class MessagingModule extends AbstractModule { - @Override protected void configure() { bind(AuthorFactory.class).to(AuthorFactoryImpl.class); bind(GroupFactory.class).to(GroupFactoryImpl.class); diff --git a/briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java b/briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java index ef6994824..f9c3967f8 100644 --- a/briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java +++ b/briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java @@ -7,7 +7,6 @@ import com.google.inject.Singleton; public class DuplexMessagingModule extends AbstractModule { - @Override protected void configure() { bind(DuplexConnectionFactory.class).to( DuplexConnectionFactoryImpl.class).in(Singleton.class); diff --git a/briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java b/briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java index b69086258..4455fbe60 100644 --- a/briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java +++ b/briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java @@ -7,7 +7,6 @@ import com.google.inject.Singleton; public class SimplexMessagingModule extends AbstractModule { - @Override protected void configure() { bind(SimplexConnectionFactory.class).to( SimplexConnectionFactoryImpl.class).in(Singleton.class); diff --git a/briar-core/src/net/sf/briar/plugins/JavaSePluginsModule.java b/briar-core/src/net/sf/briar/plugins/JavaSePluginsModule.java index 762a32e0a..b4f5d87df 100644 --- a/briar-core/src/net/sf/briar/plugins/JavaSePluginsModule.java +++ b/briar-core/src/net/sf/briar/plugins/JavaSePluginsModule.java @@ -23,7 +23,6 @@ import com.google.inject.Provides; public class JavaSePluginsModule extends AbstractModule { - @Override public void configure() {} @Provides diff --git a/briar-core/src/net/sf/briar/plugins/PluginsModule.java b/briar-core/src/net/sf/briar/plugins/PluginsModule.java index e93270b85..2ed0a78c5 100644 --- a/briar-core/src/net/sf/briar/plugins/PluginsModule.java +++ b/briar-core/src/net/sf/briar/plugins/PluginsModule.java @@ -32,7 +32,6 @@ public class PluginsModule extends AbstractModule { 60, SECONDS, queue, policy); } - @Override protected void configure() { bind(Poller.class).to(PollerImpl.class); } diff --git a/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java b/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java index a9ab99472..eb8744245 100644 --- a/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java +++ b/briar-core/src/net/sf/briar/reliability/ReliabilityModule.java @@ -32,7 +32,6 @@ public class ReliabilityModule extends AbstractModule { 60, SECONDS, queue, policy); } - @Override protected void configure() { bind(ReliabilityLayerFactory.class).to( ReliabilityLayerFactoryImpl.class); diff --git a/briar-core/src/net/sf/briar/serial/SerialModule.java b/briar-core/src/net/sf/briar/serial/SerialModule.java index 667087076..acc25ce2b 100644 --- a/briar-core/src/net/sf/briar/serial/SerialModule.java +++ b/briar-core/src/net/sf/briar/serial/SerialModule.java @@ -9,11 +9,10 @@ import com.google.inject.Singleton; public class SerialModule extends AbstractModule { - @Override protected void configure() { bind(ReaderFactory.class).to(ReaderFactoryImpl.class); - bind(SerialComponent.class).to(SerialComponentImpl.class).in( - Singleton.class); + bind(SerialComponent.class).to( + SerialComponentImpl.class).in(Singleton.class); bind(WriterFactory.class).to(WriterFactoryImpl.class); } } diff --git a/briar-core/src/net/sf/briar/transport/TransportModule.java b/briar-core/src/net/sf/briar/transport/TransportModule.java index 060db5894..3d08f5802 100644 --- a/briar-core/src/net/sf/briar/transport/TransportModule.java +++ b/briar-core/src/net/sf/briar/transport/TransportModule.java @@ -37,7 +37,6 @@ public class TransportModule extends AbstractModule { Integer.MAX_VALUE, 60, SECONDS, queue, policy); } - @Override protected void configure() { bind(ConnectionDispatcher.class).to(ConnectionDispatcherImpl.class); bind(ConnectionReaderFactory.class).to( diff --git a/briar-tests/src/net/sf/briar/TestDatabaseModule.java b/briar-tests/src/net/sf/briar/TestDatabaseModule.java index 5479d9c6b..0082dbbe9 100644 --- a/briar-tests/src/net/sf/briar/TestDatabaseModule.java +++ b/briar-tests/src/net/sf/briar/TestDatabaseModule.java @@ -22,7 +22,6 @@ public class TestDatabaseModule extends AbstractModule { this.config = new TestDatabaseConfig(dir, maxSize); } - @Override protected void configure() { bind(DatabaseConfig.class).toInstance(config); } diff --git a/briar-tests/src/net/sf/briar/TestLifecycleModule.java b/briar-tests/src/net/sf/briar/TestLifecycleModule.java index 0517d7fc7..fc8c0b113 100644 --- a/briar-tests/src/net/sf/briar/TestLifecycleModule.java +++ b/briar-tests/src/net/sf/briar/TestLifecycleModule.java @@ -10,7 +10,6 @@ import com.google.inject.AbstractModule; public class TestLifecycleModule extends AbstractModule { - @Override protected void configure() { bind(LifecycleManager.class).toInstance(new LifecycleManager() { diff --git a/briar-tests/src/net/sf/briar/TestUiModule.java b/briar-tests/src/net/sf/briar/TestUiModule.java index c8cd610b6..4242b6c2e 100644 --- a/briar-tests/src/net/sf/briar/TestUiModule.java +++ b/briar-tests/src/net/sf/briar/TestUiModule.java @@ -6,7 +6,6 @@ import com.google.inject.AbstractModule; public class TestUiModule extends AbstractModule { - @Override protected void configure() { bind(UiCallback.class).toInstance(new UiCallback() {