diff options
Diffstat (limited to 'platform/remote-servers/impl/src/com/intellij/remoteServer')
4 files changed, 105 insertions, 11 deletions
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java index 4fb4bed03d1e..2e0797f01ee5 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConfigurableBase.java @@ -3,7 +3,13 @@ package com.intellij.remoteServer.util; import com.intellij.execution.configurations.RuntimeConfigurationError; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.UnnamedConfigurable; +import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.remoteServer.ServerType; +import com.intellij.remoteServer.configuration.RemoteServer; +import com.intellij.remoteServer.configuration.RemoteServersManager; +import com.intellij.util.text.UniqueNameGenerator; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -13,12 +19,18 @@ import javax.swing.*; */ public abstract class CloudConfigurableBase<SC extends CloudConfigurationBase> implements UnnamedConfigurable { + private final ServerType<SC> myCloudType; protected final SC myConfiguration; - public CloudConfigurableBase(SC configuration) { + public CloudConfigurableBase(ServerType<SC> cloudType, SC configuration) { + myCloudType = cloudType; myConfiguration = configuration; } + protected final ServerType<SC> getCloudType() { + return myCloudType; + } + @Nullable @Override public JComponent createComponent() { @@ -33,6 +45,20 @@ public abstract class CloudConfigurableBase<SC extends CloudConfigurationBase> i @Override public void apply() throws ConfigurationException { + applyCoreTo(myConfiguration); + } + + @Override + public void reset() { + getEmailTextField().setText(myConfiguration.getEmail()); + getPasswordField().setText(myConfiguration.getPassword()); + } + + @Override + public void disposeUIResources() { + } + + protected void applyCoreTo(SC configuration) throws ConfigurationException { String email = getEmailTextField().getText(); if (StringUtil.isEmpty(email)) { throw new RuntimeConfigurationError("Email required"); @@ -42,18 +68,40 @@ public abstract class CloudConfigurableBase<SC extends CloudConfigurationBase> i throw new RuntimeConfigurationError("Password required"); } - myConfiguration.setEmail(email); - myConfiguration.setPassword(password); + configuration.setEmail(email); + configuration.setPassword(password); } - @Override - public void reset() { - getEmailTextField().setText(myConfiguration.getEmail()); - getPasswordField().setText(myConfiguration.getPassword()); + protected boolean isCoreConfigEqual(SC configuration1, SC configuration2) { + return Comparing.equal(configuration1.getEmail(), configuration2.getEmail()) + && Comparing.equal(configuration1.getPassword(), configuration2.getPassword()); } - @Override - public void disposeUIResources() { + private String generateServerName() { + return UniqueNameGenerator.generateUniqueName(myCloudType.getPresentableName(), new Condition<String>() { + + @Override + public boolean value(String s) { + for (RemoteServer<?> server : RemoteServersManager.getInstance().getServers()) { + if (server.getName().equals(s)) { + return false; + } + } + return true; + } + }); + } + + protected final RemoteServer<SC> createTempServer() { + RemoteServer<SC> tempServer = RemoteServersManager.getInstance().createServer(myCloudType, generateServerName()); + SC newConfiguration = tempServer.getConfiguration(); + try { + applyCoreTo(newConfiguration); + } + catch (ConfigurationException e) { + return null; + } + return tempServer; } protected abstract JComponent getMainPanel(); diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudGitApplicationRuntime.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudGitApplicationRuntime.java index 5f40b5ac4257..3a34bb456ad6 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudGitApplicationRuntime.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudGitApplicationRuntime.java @@ -45,11 +45,11 @@ public class CloudGitApplicationRuntime extends CloudApplicationRuntime { myDeployment = serverRuntime.getAgent().createDeployment(applicationName, myLoggingHandler); } - protected CloudMultiSourceServerRuntimeInstance getServerRuntime() { + public CloudMultiSourceServerRuntimeInstance getServerRuntime() { return myServerRuntime; } - protected DeploymentLogManager getLogManager() { + public DeploymentLogManager getLogManager() { return myLogManager; } diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java index 346bd0af3046..89535ab6b8e6 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudLoggingHandlerImpl.java @@ -15,11 +15,14 @@ */ package com.intellij.remoteServer.util; +import com.intellij.execution.process.ProcessHandler; import com.intellij.remoteServer.agent.util.CloudAgentLoggingHandler; import com.intellij.remoteServer.agent.util.log.LogListener; import com.intellij.remoteServer.runtime.deployment.DeploymentLogManager; import com.intellij.remoteServer.runtime.log.LoggingHandler; +import org.jetbrains.annotations.Nullable; +import java.io.OutputStream; import java.util.HashMap; /** @@ -60,4 +63,40 @@ public class CloudLoggingHandlerImpl implements CloudAgentLoggingHandler { } return logListener; } + + @Override + public LogListener createConsole(String pipeName, final OutputStream consoleInput) { + final LoggingHandler loggingHandler = myLogManager.addAdditionalLog(pipeName); + loggingHandler.attachToProcess(new ProcessHandler() { + + @Override + protected void destroyProcessImpl() { + + } + + @Override + protected void detachProcessImpl() { + + } + + @Override + public boolean detachIsDefault() { + return false; + } + + @Nullable + @Override + public OutputStream getProcessInput() { + return consoleInput; + } + }); + + return new LogListener() { + + @Override + public void lineLogged(String line) { + loggingHandler.print(line); + } + }; + } } diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSilentLoggingHandlerImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSilentLoggingHandlerImpl.java index 49321fdfc398..31825120100a 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSilentLoggingHandlerImpl.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSilentLoggingHandlerImpl.java @@ -4,6 +4,8 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.remoteServer.agent.util.CloudAgentLoggingHandler; import com.intellij.remoteServer.agent.util.log.LogListener; +import java.io.OutputStream; + /** * @author michael.golubev */ @@ -20,4 +22,9 @@ public class CloudSilentLoggingHandlerImpl implements CloudAgentLoggingHandler { public LogListener getOrCreateLogListener(String pipeName) { return LogListener.NULL; } + + @Override + public LogListener createConsole(String pipeName, OutputStream consoleInput) { + return LogListener.NULL; + } } |