MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Don't use deprecated method (fixed PY-13172 among others).

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-06-16 20:19:42 +02:00
parent f64a1750b2
commit 69fef44086
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/remote/RemoteSdkProducer.java
+2
View File
@@ -28,6 +28,7 @@ public interface RemoteSdkProducer<T extends RemoteSdkCredentials> {
* @throws InterruptedException
* @deprecated
*/
@Deprecated
T getRemoteSdkCredentials() throws InterruptedException;
T getRemoteSdkCredentials(boolean allowSynchronousInteraction) throws InterruptedException, ExecutionException;
@@ -38,6 +39,7 @@ public interface RemoteSdkProducer<T extends RemoteSdkCredentials> {
* @param remoteSdkCredentialsConsumer
* @deprecated
*/
@Deprecated
void produceRemoteSdkCredentials(Consumer<T> remoteSdkCredentialsConsumer);
Object getRemoteSdkDataKey();
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+8 -12
View File
@@ -131,6 +131,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
public static Key<Sdk> CONSOLE_SDK = new Key<Sdk>("PYDEV_CONSOLE_SDK_KEY");
private static final long APPROPRIATE_TO_WAIT = 60000;
private PyRemoteSdkCredentials myRemoteCredentials;
protected PydevConsoleRunner(@NotNull final Project project,
@NotNull Sdk sdk, @NotNull final PyConsoleType consoleType,
@@ -352,16 +353,16 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
myCommandLine = commandLine.getCommandLineString();
try {
PyRemoteSdkCredentials remoteCredentials = data.getRemoteSdkCredentials();
myRemoteCredentials = data.getRemoteSdkCredentials(true);
PathMappingSettings mappings = manager.setupMappings(getProject(), data, null);
RemoteSshProcess remoteProcess =
manager.createRemoteProcess(getProject(), remoteCredentials, mappings, commandLine, true);
manager.createRemoteProcess(getProject(), myRemoteCredentials, mappings, commandLine, true);
Pair<Integer, Integer> remotePorts = getRemotePortsFromProcess(remoteProcess);
remoteProcess.addLocalTunnel(myPorts[0], remoteCredentials.getHost(), remotePorts.first);
remoteProcess.addLocalTunnel(myPorts[0], myRemoteCredentials.getHost(), remotePorts.first);
remoteProcess.addRemoteTunnel(remotePorts.second, "localhost", myPorts[1]);
@@ -425,15 +426,10 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
if (manager != null) {
PyRemoteSdkAdditionalDataBase data = (PyRemoteSdkAdditionalDataBase)mySdk.getSdkAdditionalData();
assert data != null;
try {
myProcessHandler =
manager.createConsoleProcessHandler(process, data.getRemoteSdkCredentials(), getConsoleView(), myPydevConsoleCommunication,
myCommandLine, CharsetToolkit.UTF8_CHARSET,
manager.setupMappings(getProject(), data, null));
}
catch (InterruptedException e) {
LOG.error("Error getting remote credentials");
}
myProcessHandler =
manager.createConsoleProcessHandler(process, myRemoteCredentials, getConsoleView(), myPydevConsoleCommunication,
myCommandLine, CharsetToolkit.UTF8_CHARSET,
manager.setupMappings(getProject(), data, null));
}
else {
LOG.error("Can't create remote console process handler");
python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class PyRemoteProcessStarter {
try {
settings = manager.setupMappings(project, pyRemoteSdkAdditionalDataBase, settings);
return manager.startRemoteProcess(project, pyRemoteSdkAdditionalDataBase.getRemoteSdkCredentials(), commandLine,
return manager.startRemoteProcess(project, pyRemoteSdkAdditionalDataBase.getRemoteSdkCredentials(true), commandLine,
settings);
}
catch (InterruptedException e) {