Merge remote-tracking branch 'origin/master'

platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java

@@ -18,12 +18,14 @@ package com.intellij.ide.ui.laf.darcula.ui;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.ui.GraphicsUtil;
 import com.intellij.util.ui.UIUtil;
 import sun.swing.SwingUtilities2;
 
 import javax.swing.*;
 import javax.swing.border.Border;
+import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicButtonUI;
@@ -146,18 +148,18 @@ public class DarculaButtonUI extends BasicButtonUI {
   }
 
   protected Color getButtonColor1() {
-    return UIManager.getColor("Button.darcula.color1");
+    return ObjectUtils.notNull(UIManager.getColor("Button.darcula.color1"), new ColorUIResource(0x555a5c));
   }
 
   protected Color getButtonColor2() {
-    return UIManager.getColor("Button.darcula.color2");
+    return ObjectUtils.notNull(UIManager.getColor("Button.darcula.color2"), new ColorUIResource(0x414648));
   }
 
   protected Color getSelectedButtonColor1() {
-    return UIManager.getColor("Button.darcula.selection.color1");
+    return ObjectUtils.notNull(UIManager.getColor("Button.darcula.selection.color1"), new ColorUIResource(0x384f6b));
   }
 
   protected Color getSelectedButtonColor2() {
-    return UIManager.getColor("Button.darcula.selection.color2");
+    return ObjectUtils.notNull(UIManager.getColor("Button.darcula.selection.color2"), new ColorUIResource(0x233143));
   }
 }

platform/remote-servers/api/src/com/intellij/remoteServer/runtime/deployment/DeploymentRuntime.java

@@ -16,4 +16,8 @@ public abstract class DeploymentRuntime {
   public interface UndeploymentTaskCallback extends RemoteOperationCallback {
     void succeeded();
   }
+
+  public Integer compareTo(DeploymentRuntime other) {
+    return null;
+  }
 }

platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java

@@ -290,16 +290,29 @@ public class ServerConnectionImpl<D extends DeploymentConfiguration> implements
   @NotNull
   @Override
   public Collection<Deployment> getDeployments() {
-    Map<String, Deployment> result;
-    synchronized (myRemoteDeployments) {
-      result = new HashMap<String, Deployment>(myRemoteDeployments);
-    }
-    synchronized (myLocalDeployments) {
-      for (Deployment deployment : myLocalDeployments.values()) {
-        result.put(deployment.getName(), deployment);
+    Set<Deployment> result = new TreeSet<Deployment>(new Comparator<Deployment>() {
+
+      @Override
+      public int compare(Deployment o1, Deployment o2) {
+        DeploymentRuntime runtime1 = o1.getRuntime();
+        DeploymentRuntime runtime2 = o2.getRuntime();
+        if (runtime1 != null && runtime2 != null) {
+          Integer runtimeCompareResult = runtime1.compareTo(runtime2);
+          if (runtimeCompareResult != null) {
+            return runtimeCompareResult;
+          }
+        }
+        return o1.getName().compareTo(o2.getName());
       }
+    });
+    synchronized (myLocalDeployments) {
+      result.addAll(myLocalDeployments.values());
     }
-    return result.values();
+
+    synchronized (myRemoteDeployments) {
+      result.addAll(myRemoteDeployments.values());
+    }
+    return result;
   }
 
   @Override

platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudServerRuntimeInstance.java

@@ -111,12 +111,16 @@ public abstract class CloudServerRuntimeInstance
       public List<CloudApplicationRuntime> compute() {
         List<CloudApplicationRuntime> result = new ArrayList<CloudApplicationRuntime>();
         for (CloudRemoteApplication application : getAgent().getApplications()) {
-          result.add(createApplicationRuntime(application.getName()));
+          result.add(createApplicationRuntime(application));
         }
         return result;
       }
     });
   }
 
+  protected CloudApplicationRuntime createApplicationRuntime(CloudRemoteApplication application) {
+    return createApplicationRuntime(application.getName());
+  }
+
   protected abstract CloudApplicationRuntime createApplicationRuntime(String applicationName);
 }