From f370545bbf350289a875dd7e57dc78e3e31509e8 Mon Sep 17 00:00:00 2001
From: Michael Golubev <michael.golubev@jetbrains.com>
Date: Tue, 10 Dec 2013 15:09:31 +0100
Subject: [PATCH] OpenShift integration - deploy EAR artifacts

---
 .../deployment/JavaDeploymentSourceUtil.java  |  4 ++++
 .../JavaDeploymentSourceUtilImpl.java         | 24 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/java/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/JavaDeploymentSourceUtil.java b/java/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/JavaDeploymentSourceUtil.java
index d096d8eef166..77ad3c7478eb 100644
--- a/java/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/JavaDeploymentSourceUtil.java
+++ b/java/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/JavaDeploymentSourceUtil.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactPointer;
+import com.intellij.packaging.artifacts.ArtifactType;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -38,4 +39,7 @@ public abstract class JavaDeploymentSourceUtil {
   @NotNull
   public abstract List<DeploymentSource> createArtifactDeploymentSources(@NotNull Project project,
                                                                          @NotNull Collection<? extends Artifact> artifacts);
+
+  @NotNull
+  public abstract List<DeploymentSource> createArtifactDeploymentSources(Project project, ArtifactType... artifactTypes);
 }
diff --git a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/JavaDeploymentSourceUtilImpl.java b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/JavaDeploymentSourceUtilImpl.java
index 25f2229e9c2a..680124876cd2 100644
--- a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/JavaDeploymentSourceUtilImpl.java
+++ b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/JavaDeploymentSourceUtilImpl.java
@@ -16,17 +16,14 @@
 package com.intellij.remoteServer.impl.configuration.deployment;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.packaging.artifacts.Artifact;
-import com.intellij.packaging.artifacts.ArtifactPointer;
-import com.intellij.packaging.artifacts.ArtifactPointerManager;
+import com.intellij.packaging.artifacts.*;
 import com.intellij.remoteServer.configuration.deployment.ArtifactDeploymentSource;
 import com.intellij.remoteServer.configuration.deployment.DeploymentSource;
 import com.intellij.remoteServer.configuration.deployment.JavaDeploymentSourceUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author nik
@@ -49,4 +46,19 @@ public class JavaDeploymentSourceUtilImpl extends JavaDeploymentSourceUtil {
     }
     return sources;
   }
+
+  @NotNull
+  @Override
+  public List<DeploymentSource> createArtifactDeploymentSources(Project project, ArtifactType... artifactTypes) {
+    if (project.isDefault()) return Collections.emptyList();
+    Artifact[] artifacts = ArtifactManager.getInstance(project).getArtifacts();
+    List<Artifact> supportedArtifacts = new ArrayList<Artifact>();
+    Set<ArtifactType> typeSet = ContainerUtil.set(artifactTypes);
+    for (Artifact artifact : artifacts) {
+      if (typeSet.contains(artifact.getArtifactType())) {
+        supportedArtifacts.add(artifact);
+      }
+    }
+    return createArtifactDeploymentSources(project, supportedArtifacts);
+  }
 }