Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2013-06-17 13:19:49 +04:00
2 changed files with 2 additions and 2 deletions
@@ -34,7 +34,7 @@ public abstract class PythonRemoteInterpreterManager implements RemoteSdkFactory
public final static ExtensionPointName<PythonRemoteInterpreterManager> EP_NAME =
ExtensionPointName.create("Pythonid.remoteInterpreterManager");
public static final String WEB_DEPLOYMENT_PLUGIN_IS_DISABLED =
"Remote interpreter can't be executed. Please enable WebDeployment plugin.";
"Remote interpreter can't be executed. Please enable the Remote Hosts Access plugin.";
public abstract ProcessHandler startRemoteProcess(@Nullable Project project,
@NotNull PyRemoteSdkAdditionalData data,
@@ -128,7 +128,7 @@ public class InterpreterPathChooser extends BaseListPopupStep<String> {
remoteInterpreterManager.addRemoteSdk(myProject, myOwnerComponent, Lists.newArrayList(myExistingSdks), myCallback);
}
else {
Messages.showErrorDialog("WebDeployment is missing. Please enable WebDeployment plugin.", "Add Remote Interpreter");
Messages.showErrorDialog("The Remote Hosts Access plugin is missing. Please enable the plugin in Settings | Plugins.", "Add Remote Interpreter");
}
}