Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 57 insertions, 9 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();