diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/remote')
4 files changed, 40 insertions, 1 deletions
diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteSdkAdditionalData.java b/platform/platform-impl/src/com/intellij/remote/RemoteSdkAdditionalData.java index b51c85bc2c18..2da812614b88 100644 --- a/platform/platform-impl/src/com/intellij/remote/RemoteSdkAdditionalData.java +++ b/platform/platform-impl/src/com/intellij/remote/RemoteSdkAdditionalData.java @@ -25,8 +25,9 @@ public interface RemoteSdkAdditionalData<T extends RemoteSdkCredentials> extends SdkAdditionalData, RemoteSdkCredentialsProducer<T>, RemoteSdkProperties { void completeInitialization(); + @Deprecated boolean isInitialized(); - + @Deprecated void setInitialized(boolean initialized); void setVagrantConnectionType(@NotNull VagrantBasedCredentialsHolder vagrantBasedCredentials); diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteSdkCredentialsHolder.java b/platform/platform-impl/src/com/intellij/remote/RemoteSdkCredentialsHolder.java index d92839e212b8..ae84919ac9ce 100644 --- a/platform/platform-impl/src/com/intellij/remote/RemoteSdkCredentialsHolder.java +++ b/platform/platform-impl/src/com/intellij/remote/RemoteSdkCredentialsHolder.java @@ -144,6 +144,16 @@ public class RemoteSdkCredentialsHolder extends RemoteCredentialsHolder implemen myRemoteSdkProperties.setInitialized(initialized); } + @Override + public boolean isValid() { + return myRemoteSdkProperties.isValid(); + } + + @Override + public void setValid(boolean valid) { + myRemoteSdkProperties.setValid(valid); + } + public static boolean isRemoteSdk(@Nullable String path) { if (path != null) { return path.startsWith(SSH_PREFIX) || path.startsWith(RemoteConnectionCredentialsWrapper.VAGRANT_PREFIX) || diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteSdkProperties.java b/platform/platform-impl/src/com/intellij/remote/RemoteSdkProperties.java index a690afd96afc..d9cca99cce14 100644 --- a/platform/platform-impl/src/com/intellij/remote/RemoteSdkProperties.java +++ b/platform/platform-impl/src/com/intellij/remote/RemoteSdkProperties.java @@ -84,9 +84,19 @@ public interface RemoteSdkProperties { String getSdkId(); + /** + * isValid() is used now + * To be removed in IDEA 15 + * + * @deprecated + */ @Deprecated boolean isInitialized(); @Deprecated void setInitialized(boolean initialized); + + boolean isValid(); + + void setValid(boolean valid); } diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteSdkPropertiesHolder.java b/platform/platform-impl/src/com/intellij/remote/RemoteSdkPropertiesHolder.java index a0407d27f7e9..68e22f79c7fc 100644 --- a/platform/platform-impl/src/com/intellij/remote/RemoteSdkPropertiesHolder.java +++ b/platform/platform-impl/src/com/intellij/remote/RemoteSdkPropertiesHolder.java @@ -36,6 +36,7 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { private static final String REMOTE_ROOTS = "REMOTE_ROOTS"; private static final String REMOTE_PATH = "REMOTE_PATH"; private static final String INITIALIZED = "INITIALIZED"; + private static final String VALID = "VALID"; private static final String PATH_MAPPINGS = "PATH_MAPPINGS"; private String mySdkId; @@ -51,6 +52,8 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { private boolean myInitialized = false; + private boolean myValid = true; + @NotNull private PathMappingSettings myPathMappings = new PathMappingSettings(); @@ -144,6 +147,16 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { myInitialized = initialized; } + @Override + public boolean isValid() { + return myValid; + } + + @Override + public void setValid(boolean valid) { + myValid = valid; + } + public void copyTo(RemoteSdkProperties copy) { copy.setInterpreterPath(getInterpreterPath()); copy.setHelpersPath(getHelpersPath()); @@ -152,6 +165,8 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { copy.setRemoteRoots(getRemoteRoots()); copy.setInitialized(isInitialized()); + + copy.setValid(isValid()); } public void save(Element rootElement) { @@ -159,6 +174,7 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { rootElement.setAttribute(HELPERS_PATH, StringUtil.notNullize(getHelpersPath())); rootElement.setAttribute(INITIALIZED, Boolean.toString(isInitialized())); + rootElement.setAttribute(VALID, Boolean.toString(isValid())); PathMappingSettings.writeExternal(rootElement, myPathMappings); @@ -177,6 +193,8 @@ public class RemoteSdkPropertiesHolder implements RemoteSdkProperties { setInitialized(StringUtil.parseBoolean(element.getAttributeValue(INITIALIZED), true)); + setValid(StringUtil.parseBoolean(element.getAttributeValue(VALID), true)); + setPathMappings(PathMappingSettings.readExternal(element)); } } |