Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vladimir Orlov
2014-06-16 18:07:38 +04:00
3 changed files with 2 additions and 5 deletions
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
* @author traff
*/
public interface RemoteSdkAdditionalData<T extends RemoteSdkCredentials>
extends SdkAdditionalData, RemoteSdkProducer<T>, RemoteSdkProperties {
extends SdkAdditionalData, RemoteSdkCredentialsProducer<T>, RemoteSdkProperties {
void completeInitialization();
boolean isInitialized();
@@ -1,8 +1,5 @@
package com.intellij.remote;
import com.intellij.remote.MutableRemoteCredentials;
import com.intellij.remote.RemoteSdkProperties;
/**
* @author traff
*/
@@ -21,7 +21,7 @@ import com.intellij.util.Consumer;
/**
* @author traff
*/
public interface RemoteSdkProducer<T extends RemoteSdkCredentials> {
public interface RemoteSdkCredentialsProducer<T extends RemoteSdkCredentials> {
/**
* Synchronously returns remote sdk credentials
* @return