From ea06cf43115b2d0cfa84dd86a78e6b7639070842 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Wed, 14 Mar 2012 19:48:08 +0400 Subject: [PATCH] introduce project parameter --- .../jetbrains/android/actions/AndroidRunSdkToolAction.java | 4 ++-- .../jetbrains/android/actions/RunAndroidAvdManagerAction.java | 3 ++- .../jetbrains/android/actions/RunAndroidSdkManagerAction.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/actions/AndroidRunSdkToolAction.java b/plugins/android/src/org/jetbrains/android/actions/AndroidRunSdkToolAction.java index 26f5889d55f1..672df2f3813f 100644 --- a/plugins/android/src/org/jetbrains/android/actions/AndroidRunSdkToolAction.java +++ b/plugins/android/src/org/jetbrains/android/actions/AndroidRunSdkToolAction.java @@ -59,8 +59,8 @@ public abstract class AndroidRunSdkToolAction extends AnAction { } sdkPath = sdks[index]; } - doRunTool(sdkPath); + doRunTool(project, sdkPath); } - protected abstract void doRunTool(@NotNull String sdkPath); + protected abstract void doRunTool(@NotNull Project project, @NotNull String sdkPath); } diff --git a/plugins/android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java b/plugins/android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java index 5560def58061..dce6550d55d4 100644 --- a/plugins/android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java +++ b/plugins/android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java @@ -20,6 +20,7 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidCommonUtils; import org.jetbrains.android.util.AndroidUtils; @@ -39,7 +40,7 @@ public class RunAndroidAvdManagerAction extends AndroidRunSdkToolAction { } @Override - protected void doRunTool(@NotNull String sdkPath) { + protected void doRunTool(@NotNull Project project, @NotNull String sdkPath) { runAvdManager(sdkPath); } diff --git a/plugins/android/src/org/jetbrains/android/actions/RunAndroidSdkManagerAction.java b/plugins/android/src/org/jetbrains/android/actions/RunAndroidSdkManagerAction.java index 52029d98ca81..8a896827c172 100644 --- a/plugins/android/src/org/jetbrains/android/actions/RunAndroidSdkManagerAction.java +++ b/plugins/android/src/org/jetbrains/android/actions/RunAndroidSdkManagerAction.java @@ -20,6 +20,7 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidCommonUtils; import org.jetbrains.android.util.AndroidUtils; @@ -39,7 +40,7 @@ public class RunAndroidSdkManagerAction extends AndroidRunSdkToolAction { } @Override - protected void doRunTool(@NotNull final String sdkPath) { + protected void doRunTool(@NotNull Project project, @NotNull final String sdkPath) { ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { @Override public void run() {