Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Renamed ConnectionManager to ConnectionDispatcher.

Browse Source 
Because that's what it does.
This commit is contained in:
akwizgran
2014-11-05 19:47:54 +00:00
parent 4ca83842d1
commit c202b6f0ac
11 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/org/briarproject/plugins/ConnectionDispatcherImpl.java → briar-core/src/org/briarproject/plugins/ConnectionManagerImpl.java
View File

@@ -19,7 +19,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.IoExecutor;
import org.briarproject.api.messaging.MessagingSession;
import org.briarproject.api.messaging.MessagingSessionFactory;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.ConnectionRegistry;
import org.briarproject.api.plugins.TransportConnectionReader;
import org.briarproject.api.plugins.TransportConnectionWriter;
@@ -31,10 +31,10 @@ import org.briarproject.api.transport.StreamWriter;
import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.api.transport.TagRecogniser;
class ConnectionDispatcherImpl implements ConnectionDispatcher {
class ConnectionManagerImpl implements ConnectionManager {
private static final Logger LOG =
Logger.getLogger(ConnectionDispatcherImpl.class.getName());
Logger.getLogger(ConnectionManagerImpl.class.getName());
private final Executor ioExecutor;
private final KeyManager keyManager;
@@ -45,7 +45,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
private final ConnectionRegistry connectionRegistry;
@Inject
ConnectionDispatcherImpl(@IoExecutor Executor ioExecutor,
ConnectionManagerImpl(@IoExecutor Executor ioExecutor,
KeyManager keyManager, TagRecogniser tagRecogniser,
StreamReaderFactory streamReaderFactory,
StreamWriterFactory streamWriterFactory,
@@ -60,22 +60,22 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
this.connectionRegistry = connectionRegistry;
}
public void dispatchIncomingConnection(TransportId t,
public void manageIncomingConnection(TransportId t,
TransportConnectionReader r) {
ioExecutor.execute(new DispatchIncomingSimplexConnection(t, r));
}
public void dispatchIncomingConnection(TransportId t,
public void manageIncomingConnection(TransportId t,
DuplexTransportConnection d) {
ioExecutor.execute(new DispatchIncomingDuplexConnection(t, d));
}
public void dispatchOutgoingConnection(ContactId c, TransportId t,
public void manageOutgoingConnection(ContactId c, TransportId t,
TransportConnectionWriter w) {
ioExecutor.execute(new DispatchOutgoingSimplexConnection(c, t, w));
}
public void dispatchOutgoingConnection(ContactId c, TransportId t,
public void manageOutgoingConnection(ContactId c, TransportId t,
DuplexTransportConnection d) {
ioExecutor.execute(new DispatchOutgoingDuplexConnection(c, t, d));
}

16
briar-core/src/org/briarproject/plugins/PluginManagerImpl.java
View File

@@ -24,7 +24,7 @@ import org.briarproject.api.TransportProperties;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.IoExecutor;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginCallback;
import org.briarproject.api.plugins.PluginManager;
@@ -55,7 +55,7 @@ class PluginManagerImpl implements PluginManager {
private final Clock clock;
private final DatabaseComponent db;
private final Poller poller;
private final ConnectionDispatcher dispatcher;
private final ConnectionManager connectionManager;
private final UiCallback uiCallback;
private final Map<TransportId, Plugin> plugins;
private final List<SimplexPlugin> simplexPlugins;
@@ -66,14 +66,14 @@ class PluginManagerImpl implements PluginManager {
SimplexPluginConfig simplexPluginConfig,
DuplexPluginConfig duplexPluginConfig, Clock clock,
DatabaseComponent db, Poller poller,
ConnectionDispatcher dispatcher, UiCallback uiCallback) {
ConnectionManager connectionManager, UiCallback uiCallback) {
this.ioExecutor = ioExecutor;
this.simplexPluginConfig = simplexPluginConfig;
this.duplexPluginConfig = duplexPluginConfig;
this.clock = clock;
this.db = db;
this.poller = poller;
this.dispatcher = dispatcher;
this.connectionManager = connectionManager;
this.uiCallback = uiCallback;
plugins = new ConcurrentHashMap<TransportId, Plugin>();
simplexPlugins = new CopyOnWriteArrayList<SimplexPlugin>();
@@ -378,11 +378,11 @@ class PluginManagerImpl implements PluginManager {
}
public void readerCreated(TransportConnectionReader r) {
dispatcher.dispatchIncomingConnection(id, r);
connectionManager.manageIncomingConnection(id, r);
}
public void writerCreated(ContactId c, TransportConnectionWriter w) {
dispatcher.dispatchOutgoingConnection(c, id, w);
connectionManager.manageOutgoingConnection(c, id, w);
}
}
@@ -394,12 +394,12 @@ class PluginManagerImpl implements PluginManager {
}
public void incomingConnectionCreated(DuplexTransportConnection d) {
dispatcher.dispatchIncomingConnection(id, d);
connectionManager.manageIncomingConnection(id, d);
}
public void outgoingConnectionCreated(ContactId c,
DuplexTransportConnection d) {
dispatcher.dispatchOutgoingConnection(c, id, d);
connectionManager.manageOutgoingConnection(c, id, d);
}
}
}

4
briar-core/src/org/briarproject/plugins/PluginsModule.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.plugins;
import javax.inject.Singleton;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.plugins.ConnectionDispatcher;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.ConnectionRegistry;
import org.briarproject.api.plugins.PluginManager;
@@ -15,7 +15,7 @@ public class PluginsModule extends AbstractModule {
@Override
protected void configure() {
bind(Poller.class).to(PollerImpl.class);
bind(ConnectionDispatcher.class).to(ConnectionDispatcherImpl.class);
bind(ConnectionManager.class).to(ConnectionManagerImpl.class);
bind(ConnectionRegistry.class).to(
ConnectionRegistryImpl.class).in(Singleton.class);
}