diff options
Diffstat (limited to 'platform/core-api/src/com/intellij/openapi')
5 files changed, 17 insertions, 13 deletions
diff --git a/platform/core-api/src/com/intellij/openapi/components/RoamingType.java b/platform/core-api/src/com/intellij/openapi/components/RoamingType.java index 0cbf78053953..ba4b6d8b36e6 100644 --- a/platform/core-api/src/com/intellij/openapi/components/RoamingType.java +++ b/platform/core-api/src/com/intellij/openapi/components/RoamingType.java @@ -16,5 +16,12 @@ package com.intellij.openapi.components; public enum RoamingType { - DISABLED, PER_PLATFORM, GLOBAL, PER_USER + DISABLED, + PER_PLATFORM, + @Deprecated + /** + * Use {@link #PER_USER} instead + */ + GLOBAL, + PER_USER } diff --git a/platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java b/platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java index 94ec194b9f89..5acdbe7cacf6 100644 --- a/platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java +++ b/platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java @@ -19,18 +19,22 @@ import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import org.jdom.Document; import org.jdom.JDOMException; +import org.jdom.Parent; import org.jetbrains.annotations.NotNull; import java.io.IOException; public interface SchemeProcessor<T extends ExternalizableScheme> { T readScheme(@NotNull Document schemeContent) throws InvalidDataException, IOException, JDOMException; - Document writeScheme(@NotNull T scheme) throws WriteExternalException; + + Parent writeScheme(@NotNull T scheme) throws WriteExternalException; boolean shouldBeSaved(@NotNull T scheme); + void initScheme(@NotNull T scheme); void onSchemeAdded(@NotNull T scheme); + void onSchemeDeleted(@NotNull T scheme); void onCurrentSchemeChanged(final Scheme oldCurrentScheme); diff --git a/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java b/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java index a0c0ee7dad62..abd37269985f 100644 --- a/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java +++ b/platform/core-api/src/com/intellij/openapi/options/SchemesManagerFactory.java @@ -25,9 +25,8 @@ public abstract class SchemesManagerFactory { public static final ExtensionPointName<ServiceBean> SCHEME_OWNER = ExtensionPointName.create("com.intellij.schemeOwner"); public abstract <T extends Scheme, E extends ExternalizableScheme> SchemesManager<T, E> createSchemesManager(@NotNull String fileSpec, - @NotNull SchemeProcessor<E> processor, - @NotNull RoamingType roamingType); - + @NotNull SchemeProcessor<E> processor, @NotNull RoamingType roamingType); + @NotNull public static SchemesManagerFactory getInstance() { return ServiceManager.getService(SchemesManagerFactory.class); } diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java index 3f0601ba951b..377bcc520e27 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -34,6 +34,7 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { private static final ProgressManager ourInstance = ServiceManager.getService(ProgressManager.class); } + @NotNull public static ProgressManager getInstance() { return ProgressManagerHolder.ourInstance; } diff --git a/platform/core-api/src/com/intellij/openapi/vfs/ex/http/HttpFileSystem.java b/platform/core-api/src/com/intellij/openapi/vfs/ex/http/HttpFileSystem.java index a42441fe49de..af6c670ab22a 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/ex/http/HttpFileSystem.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/ex/http/HttpFileSystem.java @@ -23,13 +23,6 @@ import com.intellij.util.io.URLUtil; import org.jetbrains.annotations.NotNull; public abstract class HttpFileSystem extends DeprecatedVirtualFileSystem { - @Deprecated - @SuppressWarnings("UnusedDeclaration") - /** - * @deprecated use {@link com.intellij.util.io.URLUtil#HTTP_PROTOCOL} - */ - public static final String PROTOCOL = URLUtil.HTTP_PROTOCOL; - public static HttpFileSystem getInstance() { return (HttpFileSystem)VirtualFileManager.getInstance().getFileSystem(URLUtil.HTTP_PROTOCOL); } @@ -43,4 +36,4 @@ public abstract class HttpFileSystem extends DeprecatedVirtualFileSystem { public abstract void removeFileListener(@NotNull HttpVirtualFileListener listener); public abstract VirtualFile createChild(@NotNull VirtualFile parent, @NotNull String name, boolean isDirectory); -}
\ No newline at end of file +} |