From 21eb657aa0414fce13777ce159458be6c8daf59d Mon Sep 17 00:00:00 2001 From: Pavel Porvatov Date: Mon, 4 Dec 2023 14:54:57 +0100 Subject: [PATCH] [Kotlin UI DSL] Deprecated unnecessary API GitOrigin-RevId: 80995190f2b1a9aa9ec43bb6aa952bc96d4d06f6 --- .../com/intellij/openapi/options/BeanConfigurable.java | 3 +++ .../openapi/options/binding/BeanValueAccessor.java | 8 +++++++- .../com/intellij/openapi/options/binding/BindControl.java | 7 ++++++- .../openapi/options/binding/ControlValueAccessor.java | 6 ++++++ .../intellij/openapi/options/binding/ValueAccessor.java | 5 +++++ .../openapi/options/binding/ValueTypeConverter.java | 6 ++++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java index b1473c59aedb..037e33bea3d2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/BeanConfigurable.java @@ -260,7 +260,10 @@ public abstract class BeanConfigurable implements UnnamedConfigurable, Config * E.g. text is read from the model and set to the edit box. * After the apply, the value from the component is queried via {@code componentGetter} and written back to model via {@code beanSetter}. * E.g. text from the edit box is queried and saved back to model bean. + * + * @deprecated Use {@see com.intellij.openapi.options.BoundConfigurable} and Kotlin UI DSL for complex configurables */ + @Deprecated(forRemoval = true) protected void component(@NotNull JComponent component, @NotNull Getter beanGetter, @NotNull Setter beanSetter, @NotNull Getter componentGetter, @NotNull Setter componentSetter) { BeanField field = new BeanField<>(new BeanMethodAccessor(beanGetter, beanSetter)) { @NotNull diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/BeanValueAccessor.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/BeanValueAccessor.java index 980b27ebfcf4..37e2f054d0a7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/binding/BeanValueAccessor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/BeanValueAccessor.java @@ -1,6 +1,8 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.options.binding; +import org.jetbrains.annotations.ApiStatus; + import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -9,7 +11,11 @@ import java.lang.reflect.Field; /** * @author Dmitry Avdeev -*/ + * + * @deprecated Use Kotlin UI DSL with bindings + */ +@ApiStatus.Internal +@Deprecated(forRemoval = true) public abstract class BeanValueAccessor extends ValueAccessor { public static BeanValueAccessor createAccessor(Object bean, final String propertyName) { diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/BindControl.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/BindControl.java index e40921605e94..ea066e1ebe2c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/binding/BindControl.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/BindControl.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.options.binding; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NonNls; import java.lang.annotation.ElementType; @@ -24,9 +25,13 @@ import java.lang.annotation.Target; /** * @author Dmitry Avdeev + * + * @deprecated Use Kotlin UI DSL with bindings */ @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) +@Target(ElementType.FIELD) +@ApiStatus.Internal +@Deprecated(forRemoval = true) public @interface BindControl { @NonNls String value() default ""; boolean instant() default false; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlValueAccessor.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlValueAccessor.java index 9db7a1f8b3aa..fb10ebd3d33d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlValueAccessor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlValueAccessor.java @@ -15,9 +15,15 @@ */ package com.intellij.openapi.options.binding; +import org.jetbrains.annotations.ApiStatus; + /** * @author Dmitry Avdeev + * + * @deprecated Use Kotlin UI DSL with bindings */ +@ApiStatus.Internal +@Deprecated(forRemoval = true) public abstract class ControlValueAccessor extends ValueAccessor { public abstract boolean isEnabled(); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueAccessor.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueAccessor.java index c1b3baf0d46c..7ab798b11e8c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueAccessor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueAccessor.java @@ -5,6 +5,7 @@ package com.intellij.openapi.options.binding; import com.intellij.openapi.editor.event.DocumentListener; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.EditorTextField; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -14,7 +15,11 @@ import java.awt.event.ActionListener; /** * @author Dmitry Avdeev + * + * @deprecated Use Kotlin UI DSL with bindings */ +@ApiStatus.Internal +@Deprecated(forRemoval = true) public abstract class ValueAccessor { public abstract V getValue(); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueTypeConverter.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueTypeConverter.java index a60c4557926a..5494c12398e7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueTypeConverter.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/ValueTypeConverter.java @@ -15,9 +15,15 @@ */ package com.intellij.openapi.options.binding; +import org.jetbrains.annotations.ApiStatus; + /** * @author Dmitry Avdeev + * + * @deprecated Use Kotlin UI DSL with bindings */ +@ApiStatus.Internal +@Deprecated(forRemoval = true) public abstract class ValueTypeConverter { public abstract A to(B b);