diff --git a/briar-android/src/net/sf/briar/android/AndroidModule.java b/briar-android/src/net/sf/briar/android/AndroidModule.java
index ee700f82086b2afeecedff37c239e7e5023bfe9a..06dbc4bcfa2763637f0143e217bece04442dac05 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 1880ece374d10bfb3eccb3ebbd06ddb01af8476e..3f074576e82079e6951a7fbb8e9dc14614eac81b 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 8bf9a3816dc240c51b28bd646c3af9e7f66f4aa3..f3c1d921b692215b9500e769495d4666ca453361 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 00457ed92e297e35aed7065e2a0de9a4262fd5f8..288007a9dce04f4c92b5fc7068b81fcdd71e29b2 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 50db206686bbecd8ba8c40927f681806cb5763e6..eb625c951674d1aa79af63f16b4c9d8d8f471f80 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 b2e476572f0ef01cda84d215e9dd2bf4d83c513b..4c5293fb15a8127f8112a5db40a3fb46ae65879a 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 f4b214dea4ecd3acb50a195af420191e8bf3535b..d1b5c2b5c179dad699278ac4f65ea225414ef107 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 a92c75e459ebea9597deed2b87e7660fc5f00600..44b157455fbb182a67f71f843ffe9dec51f30c24 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 ef699482433fa94db9a6a32e5d655e3f3f97400d..f9c3967f897661659fc82aa8c28de74a752a24fe 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 b69086258b2c48b4b4c139aaedb8f9af65f48f45..4455fbe603720838d1b3373cfb98c3ca66f93457 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 762a32e0afd650b61f98b5e7b9ab978eb10dab94..b4f5d87df45181e3c295debc4d98b0aa61e8cf81 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 e93270b85ddff337c970ff88bbb0f47c0095df19..2ed0a78c51978752ae6455def96a970a1d832243 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 a9ab994723946e89d6ec3b4b0ce125c15b95c4f3..eb8744245f469de7d383b6564baf9e452ed2f0b1 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 667087076b365b859b2f05b85272c3fb09434239..acc25ce2b5faa905d9b423eb7eb9d128cd016692 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 060db58944462719748e641f352bf307fdd82647..3d08f5802412dfb678290ca53230a8488f571e63 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 5479d9c6bd62248c3f605e59776b770a3d68bf1d..0082dbbe9d1b9dd182378f59c0dccf88d51ae558 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 0517d7fc7c7689531171b8e00c9fc020a193c860..fc8c0b1132bb844e3765dd878774cffa2882ec1e 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 c8cd610b6caae2728a0647e37691a6a7f157b3e0..4242b6c2e1686967ed46b7511dd4acbb41a359e6 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() {