MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

CR-IU-595 - introduce createTemporaryConnection - fix

Browse Source
This commit is contained in:
Michael Golubev
2014-03-26 12:00:42 +01:00
parent b197f05047
commit 737553691f
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java
+8 -3
View File
@@ -42,11 +42,14 @@ public class ServerConnectionImpl<D extends DeploymentConfiguration> implements
private final Map<String, DeploymentImpl> myLocalDeployments = new HashMap<String, DeploymentImpl>();
private final Map<String, DeploymentLogManagerImpl> myLogManagers = new ConcurrentHashMap<String, DeploymentLogManagerImpl>();
public ServerConnectionImpl(RemoteServer<?> server, ServerConnector connector, ServerConnectionManagerImpl connectionManager) {
public ServerConnectionImpl(RemoteServer<?> server,
ServerConnector connector,
@Nullable ServerConnectionManagerImpl connectionManager,
ServerConnectionEventDispatcher eventDispatcher) {
myServer = server;
myConnector = connector;
myConnectionManager = connectionManager;
myEventDispatcher = myConnectionManager.getEventDispatcher();
myEventDispatcher = eventDispatcher;
}
@NotNull
@@ -85,7 +88,9 @@ public class ServerConnectionImpl<D extends DeploymentConfiguration> implements
@Override
public void disconnect() {
myConnectionManager.removeConnection(myServer);
if (myConnectionManager != null) {
myConnectionManager.removeConnection(myServer);
}
doDisconnect();
}
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionManagerImpl.java
+5 -4
View File
@@ -26,7 +26,7 @@ public class ServerConnectionManagerImpl extends ServerConnectionManager {
ApplicationManager.getApplication().assertIsDispatchThread();
ServerConnection connection = myConnections.get(server);
if (connection == null) {
connection = doCreateConnection(server);
connection = doCreateConnection(server, this);
myConnections.put(server, connection);
myEventDispatcher.fireConnectionCreated(connection);
}
@@ -36,12 +36,13 @@ public class ServerConnectionManagerImpl extends ServerConnectionManager {
@NotNull
@Override
public <C extends ServerConfiguration> ServerConnection createTemporaryConnection(@NotNull RemoteServer<C> server) {
return doCreateConnection(server);
return doCreateConnection(server, null);
}
private <C extends ServerConfiguration> ServerConnection doCreateConnection(@NotNull RemoteServer<C> server) {
private <C extends ServerConfiguration> ServerConnection doCreateConnection(@NotNull RemoteServer<C> server,
ServerConnectionManagerImpl manager) {
ServerTaskExecutorImpl executor = new ServerTaskExecutorImpl();
return new ServerConnectionImpl(server, server.getType().createConnector(server, executor), this);
return new ServerConnectionImpl(server, server.getType().createConnector(server, executor), manager, getEventDispatcher());
}
@Nullable