MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: convert BeanConfigurable to ConfigurableBuilder

Browse Source 
GitOrigin-RevId: e244f305a3fa0b6c80d077af1f2ca5f8d07b6129
This commit is contained in:
Aleksey Pivovarov
2020-01-28 17:27:23 +03:00
committed by intellij-monorepo-bot
parent ff0b5b7f6b
commit 6e319f3f2e
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-impl/src/com/intellij/application/options/JavadocOptionsProvider.java
View File

@@ -17,13 +17,14 @@ package com.intellij.application.options;
import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.ConfigurableBuilder;
public class JavadocOptionsProvider extends BeanConfigurable<CodeInsightSettings> { public class JavadocOptionsProvider extends ConfigurableBuilder {
public JavadocOptionsProvider() { public JavadocOptionsProvider() {
super(CodeInsightSettings.getInstance(), CodeInsightBundle.message("javadoc.option.javadoc.title")); super(CodeInsightBundle.message("javadoc.option.javadoc.title"));
CodeInsightSettings settings = CodeInsightSettings.getInstance();
checkBox(CodeInsightBundle.message("javadoc.option.automatically.insert.closing.tag.javadoc"), checkBox(CodeInsightBundle.message("javadoc.option.automatically.insert.closing.tag.javadoc"),
() -> getInstance().JAVADOC_GENERATE_CLOSING_TAG, () -> settings.JAVADOC_GENERATE_CLOSING_TAG,
(value) -> getInstance().JAVADOC_GENERATE_CLOSING_TAG = value); (value) -> settings.JAVADOC_GENERATE_CLOSING_TAG = value);
} }
} }

7
json/src/com/intellij/json/editor/JsonSmartKeysConfigurable.java
View File

@@ -2,15 +2,14 @@
package com.intellij.json.editor; package com.intellij.json.editor;
import com.intellij.json.JsonBundle; import com.intellij.json.JsonBundle;
import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.ConfigurableBuilder;
import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.SearchableConfigurable;
import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class JsonSmartKeysConfigurable extends BeanConfigurable<JsonEditorOptions> implements SearchableConfigurable { public class JsonSmartKeysConfigurable extends ConfigurableBuilder implements SearchableConfigurable {
public JsonSmartKeysConfigurable() { public JsonSmartKeysConfigurable() {
super(JsonEditorOptions.getInstance()); JsonEditorOptions settings = JsonEditorOptions.getInstance();
JsonEditorOptions settings = getInstance();
if (settings == null) return; if (settings == null) return;
checkBox(JsonBundle.message("settings.smart.keys.insert.missing.comma.on.enter"), checkBox(JsonBundle.message("settings.smart.keys.insert.missing.comma.on.enter"),
() -> settings.COMMA_ON_ENTER, () -> settings.COMMA_ON_ENTER,

11
plugins/yaml/src/org/jetbrains/yaml/smart/YAMLSmartOptionsProvider.java
View File

@@ -1,14 +1,15 @@
// Copyright 2000-2019 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. // Copyright 2000-2019 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 org.jetbrains.yaml.smart; package org.jetbrains.yaml.smart;
import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.ConfigurableBuilder;
import org.jetbrains.yaml.YAMLBundle; import org.jetbrains.yaml.YAMLBundle;
public class YAMLSmartOptionsProvider extends BeanConfigurable<YAMLEditorOptions> { public class YAMLSmartOptionsProvider extends ConfigurableBuilder {
public YAMLSmartOptionsProvider() { public YAMLSmartOptionsProvider() {
super(YAMLEditorOptions.getInstance(), YAMLBundle.message("yaml.smartkeys.option.title")); super(YAMLBundle.message("yaml.smartkeys.option.title"));
YAMLEditorOptions options = YAMLEditorOptions.getInstance();
checkBox(YAMLBundle.message("yaml.smartkeys.option.paste"), checkBox(YAMLBundle.message("yaml.smartkeys.option.paste"),
getInstance()::isUseSmartPaste, options::isUseSmartPaste,
getInstance()::setUseSmartPaste); options::setUseSmartPaste);
} }
} }

5
python/src/com/jetbrains/python/codeInsight/PySmartKeysOptions.java
View File

@@ -16,7 +16,7 @@
package com.jetbrains.python.codeInsight; package com.jetbrains.python.codeInsight;
import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.ConfigurableBuilder;
import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.SearchableConfigurable;
import com.jetbrains.python.PyBundle; import com.jetbrains.python.PyBundle;
import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nls;
@@ -25,9 +25,8 @@ import org.jetbrains.annotations.NotNull;
/** /**
* @author yole * @author yole
*/ */
public class PySmartKeysOptions extends BeanConfigurable<CodeInsightSettings> implements SearchableConfigurable { public class PySmartKeysOptions extends ConfigurableBuilder implements SearchableConfigurable {
public PySmartKeysOptions() { public PySmartKeysOptions() {
super(CodeInsightSettings.getInstance());
//CodeInsightSettings.getInstance().REFORMAT_ON_PASTE = CodeInsightSettings.NO_REFORMAT; //TODO: remove combobox from settings //CodeInsightSettings.getInstance().REFORMAT_ON_PASTE = CodeInsightSettings.NO_REFORMAT; //TODO: remove combobox from settings
CodeInsightSettings commonSettings = CodeInsightSettings.getInstance(); CodeInsightSettings commonSettings = CodeInsightSettings.getInstance();
checkBox("Smart indent pasted lines", ()->commonSettings.INDENT_TO_CARET_ON_PASTE, v->commonSettings.INDENT_TO_CARET_ON_PASTE=v); checkBox("Smart indent pasted lines", ()->commonSettings.INDENT_TO_CARET_ON_PASTE, v->commonSettings.INDENT_TO_CARET_ON_PASTE=v);