From d935ddc83be6ddd201c03231dd93e8dc7004574c Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 18 Sep 2014 12:43:21 +0400 Subject: [PATCH] Google App Engine: method renamed --- .../com/intellij/appengine/facet/AppEngineSupportProvider.java | 2 +- .../com/intellij/appengine/facet/AppEngineWebIntegration.java | 2 +- .../appengine/facet/impl/AppEngineCommunityWebIntegration.java | 2 +- .../source/com/intellij/appengine/util/AppEngineUtil.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java index 1807c3c98157..a0ee39b0b1ae 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java @@ -164,7 +164,7 @@ public class AppEngineSupportProvider extends FacetBasedFrameworkSupportProvider @NotNull private static Artifact findOrCreateArtifact(AppEngineFacet appEngineFacet) { Module module = appEngineFacet.getModule(); - List artifactTypes = AppEngineWebIntegration.getInstance().getAppEngineTargetArtifactType(); + List artifactTypes = AppEngineWebIntegration.getInstance().getAppEngineTargetArtifactTypes(); final Collection artifacts = ArtifactUtil.getArtifactsContainingModuleOutput(module); for (ArtifactType type : artifactTypes) { for (Artifact artifact : artifacts) { diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineWebIntegration.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineWebIntegration.java index e5e06c867b5b..c5d414d2cd2f 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineWebIntegration.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineWebIntegration.java @@ -41,7 +41,7 @@ public abstract class AppEngineWebIntegration { public abstract VirtualFile suggestParentDirectoryForAppEngineWebXml(@NotNull Module module, @NotNull ModifiableRootModel rootModel); @NotNull - public abstract List getAppEngineTargetArtifactType(); + public abstract List getAppEngineTargetArtifactTypes(); public abstract void setupJpaSupport(@NotNull Module module, @NotNull VirtualFile persistenceXml); diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/impl/AppEngineCommunityWebIntegration.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/impl/AppEngineCommunityWebIntegration.java index cf4dec4dd77e..ad5fe5cbe39f 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/facet/impl/AppEngineCommunityWebIntegration.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/impl/AppEngineCommunityWebIntegration.java @@ -62,7 +62,7 @@ public class AppEngineCommunityWebIntegration extends AppEngineWebIntegration { @NotNull @Override - public List getAppEngineTargetArtifactType() { + public List getAppEngineTargetArtifactTypes() { return Collections.singletonList(PlainArtifactType.getInstance()); } diff --git a/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java b/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java index 4e711681638e..6ff43654b9b7 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java @@ -70,7 +70,7 @@ public class AppEngineUtil { final List artifacts = new ArrayList(); if (project.isDefault()) return artifacts; for (Artifact artifact : ArtifactManager.getInstance(project).getArtifacts()) { - if (AppEngineWebIntegration.getInstance().getAppEngineTargetArtifactType().contains(artifact.getArtifactType()) && + if (AppEngineWebIntegration.getInstance().getAppEngineTargetArtifactTypes().contains(artifact.getArtifactType()) && (!withAppEngineFacetOnly || findAppEngineFacet(project, artifact) != null)) { artifacts.add(artifact); }