diff options
Diffstat (limited to 'plugins/google-app-engine/source/com/intellij/appengine/cloud')
2 files changed, 9 insertions, 35 deletions
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudType.java b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudType.java index b69b47a034fe..855ed7a64dfe 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudType.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudType.java @@ -22,7 +22,6 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.openapi.project.Project; import com.intellij.packaging.artifacts.Artifact; -import com.intellij.packaging.artifacts.ArtifactPointerManager; import com.intellij.remoteServer.ServerType; import com.intellij.remoteServer.configuration.deployment.*; import com.intellij.remoteServer.runtime.Deployment; @@ -38,7 +37,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.util.ArrayList; import java.util.List; /** @@ -83,7 +81,7 @@ public class AppEngineCloudType extends ServerType<AppEngineServerConfiguration> @NotNull @Override - public DeploymentConfigurator createDeployer(Project project) { + public DeploymentConfigurator createDeploymentConfigurator(Project project) { return new AppEngineDeploymentConfigurator(project); } @@ -134,12 +132,7 @@ public class AppEngineCloudType extends ServerType<AppEngineServerConfiguration> @Override public List<DeploymentSource> getAvailableDeploymentSources() { List<Artifact> artifacts = AppEngineUtil.collectWebArtifacts(myProject, true); - List<DeploymentSource> sources = new ArrayList<DeploymentSource>(); - ArtifactPointerManager pointerManager = ArtifactPointerManager.getInstance(myProject); - for (Artifact artifact : artifacts) { - sources.add(DeploymentSourceUtil.getInstance().createArtifactDeploymentSource(pointerManager.createPointer(artifact))); - } - return sources; + return DeploymentSourceUtil.getInstance().createArtifactDeploymentSources(myProject, artifacts); } @NotNull @@ -165,10 +158,6 @@ public class AppEngineCloudType extends ServerType<AppEngineServerConfiguration> public void connect(@NotNull final ConnectionCallback<DummyDeploymentConfiguration> callback) { callback.connected(new AppEngineRuntimeInstance(myConfiguration)); } - - @Override - public void disconnect() { - } } private static class AppEngineRuntimeInstance extends ServerRuntimeInstance<DummyDeploymentConfiguration> { @@ -183,7 +172,7 @@ public class AppEngineCloudType extends ServerType<AppEngineServerConfiguration> Artifact artifact = ((ArtifactDeploymentSource)task.getSource()).getArtifact(); if (artifact == null) return; - AppEngineUploader uploader = AppEngineUploader.createUploader(task.getProject(), artifact, myConfiguration, callback); + AppEngineUploader uploader = AppEngineUploader.createUploader(task.getProject(), artifact, myConfiguration, callback, task.getLoggingHandler()); if (uploader != null) { uploader.startUploading(); } @@ -193,5 +182,9 @@ public class AppEngineCloudType extends ServerType<AppEngineServerConfiguration> public void computeDeployments(@NotNull ComputeDeploymentsCallback deployments) { deployments.succeeded(ContainerUtil.<Deployment>emptyList()); } + + @Override + public void disconnect() { + } } } diff --git a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineServerConfiguration.java b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineServerConfiguration.java index 9291f376fc7d..4576fb41bdde 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineServerConfiguration.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineServerConfiguration.java @@ -15,16 +15,13 @@ */ package com.intellij.appengine.cloud; -import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.remoteServer.configuration.ServerConfiguration; -import com.intellij.util.xmlb.XmlSerializerUtil; +import com.intellij.remoteServer.configuration.ServerConfigurationBase; import com.intellij.util.xmlb.annotations.Attribute; -import org.jetbrains.annotations.Nullable; /** * @author nik */ -public class AppEngineServerConfiguration extends ServerConfiguration implements PersistentStateComponent<AppEngineServerConfiguration> { +public class AppEngineServerConfiguration extends ServerConfigurationBase<AppEngineServerConfiguration> { private String myEmail; @Attribute("email") @@ -35,20 +32,4 @@ public class AppEngineServerConfiguration extends ServerConfiguration implements public void setEmail(String email) { myEmail = email; } - - @Nullable - @Override - public AppEngineServerConfiguration getState() { - return this; - } - - @Override - public void loadState(AppEngineServerConfiguration state) { - XmlSerializerUtil.copyBean(state, this); - } - - @Override - public PersistentStateComponent<?> getSerializer() { - return this; - } } |