From 6f151d52241b9f2298d555fed883ab73bb056ab8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 27 Jan 2021 18:52:08 +0300 Subject: [PATCH] cleanup: notnull, fix types in signatures GitOrigin-RevId: 041bb6022f87ec744d28648f58d90e6b4a3b7a3b --- .../execution/impl/ConfigurationSettingsEditor.java | 10 +++++----- .../ui/RunnerAndConfigurationSettingsEditor.java | 4 ++-- .../execution/ui/FragmentedSettingsBuilder.java | 4 ++-- .../execution/ui/FragmentedSettingsEditor.java | 2 +- .../openapi/options/CompositeSettingsBuilder.java | 4 ++++ .../openapi/options/CompositeSettingsEditor.java | 3 ++- .../intellij/openapi/options/GroupSettingsBuilder.java | 5 +++-- .../com/intellij/openapi/options/SettingsEditor.java | 6 +++--- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java b/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java index 310f0100c353..eae7cabd7c88 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java @@ -36,7 +36,7 @@ import java.util.*; import java.util.function.Function; public class ConfigurationSettingsEditor extends CompositeSettingsEditor { - private final ArrayList> myRunnerEditors = new ArrayList<>(); + private final List> myRunnerEditors = new ArrayList<>(); private final Map> myRunner2UnwrappedEditors = new HashMap<>(); private RunnersEditorComponent myRunnersComponent; private final RunConfiguration myConfiguration; @@ -45,7 +45,7 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor myGroupSettingsBuilder; @Override - public CompositeSettingsBuilder getBuilder() { + public @NotNull CompositeSettingsBuilder getBuilder() { init(); myGroupSettingsBuilder = new GroupSettingsBuilder<>(myCompound); return myGroupSettingsBuilder; @@ -84,15 +84,15 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor(getFactory()) { @Override - public CompositeSettingsBuilder getBuilder() { + public @NotNull CompositeSettingsBuilder getBuilder() { return new CompositeSettingsBuilder<>() { @Override - public Collection> getEditors() { + public @NotNull Collection> getEditors() { return myRunnerEditors; } @Override - public JComponent createCompoundEditor() { + public @NotNull JComponent createCompoundEditor() { return myRunnersComponent.getComponent(); } }; diff --git a/platform/execution-impl/src/com/intellij/execution/ui/RunnerAndConfigurationSettingsEditor.java b/platform/execution-impl/src/com/intellij/execution/ui/RunnerAndConfigurationSettingsEditor.java index b67694a8f3fb..8978fde935d6 100644 --- a/platform/execution-impl/src/com/intellij/execution/ui/RunnerAndConfigurationSettingsEditor.java +++ b/platform/execution-impl/src/com/intellij/execution/ui/RunnerAndConfigurationSettingsEditor.java @@ -25,12 +25,12 @@ public class RunnerAndConfigurationSettingsEditor extends SettingsEditor> myConfigurationEditor; - private final Consumer myConfigurationCreator; + private final Consumer myConfigurationCreator; private final @Nullable RunConfigurationStorageUi myRCStorageUi; public RunnerAndConfigurationSettingsEditor(RunnerAndConfigurationSettings settings, RunConfigurationFragmentedEditor> configurationEditor, - Consumer configurationCreator) { + Consumer configurationCreator) { super(settings.createFactory()); myConfigurationEditor = configurationEditor; myConfigurationCreator = configurationCreator; diff --git a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java index c35048daaed3..eb50d743a24c 100644 --- a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java +++ b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java @@ -69,12 +69,12 @@ public class FragmentedSettingsBuilder implements CompositeSettingsBui } @Override - public Collection> getEditors() { + public @NotNull Collection> getEditors() { return new ArrayList<>(myFragments); } @Override - public JComponent createCompoundEditor() { + public @NotNull JComponent createCompoundEditor() { if (myMain == null) { myPanel.setBorder(JBUI.Borders.emptyLeft(5)); addLine(new JSeparator()); diff --git a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsEditor.java b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsEditor.java index f9f7ad1ace08..feb1aaf13686 100644 --- a/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsEditor.java +++ b/platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsEditor.java @@ -71,7 +71,7 @@ public abstract class FragmentedSettingsEditor getBuilder() { + public @NotNull CompositeSettingsBuilder getBuilder() { return new FragmentedSettingsBuilder<>(getFragments(), null); } diff --git a/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsBuilder.java b/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsBuilder.java index b3dfba13b463..2c31f22d9e93 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsBuilder.java @@ -15,10 +15,14 @@ */ package com.intellij.openapi.options; +import org.jetbrains.annotations.NotNull; + import javax.swing.*; import java.util.Collection; public interface CompositeSettingsBuilder { + @NotNull Collection> getEditors(); + @NotNull JComponent createCompoundEditor(); } \ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java b/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java index b25570889fac..c41800681791 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java @@ -25,7 +25,7 @@ public abstract class CompositeSettingsEditor extends SettingsEditor factory) { + public CompositeSettingsEditor(@Nullable Factory factory) { super(factory); if (factory != null) { @@ -33,6 +33,7 @@ public abstract class CompositeSettingsEditor extends SettingsEditor getBuilder(); @Override diff --git a/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java b/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java index 897dc559aecf..f3203e236696 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.NlsContexts.TabTitle; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.components.JBTabbedPane; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -35,7 +36,7 @@ public class GroupSettingsBuilder implements CompositeSettingsBuilder { } @Override - public Collection> getEditors() { + public @NotNull Collection> getEditors() { List> result = new ArrayList<>(); List>> editors = myGroup.getEditors(); for (int i = 0; i < editors.size(); i++) { @@ -45,7 +46,7 @@ public class GroupSettingsBuilder implements CompositeSettingsBuilder { } @Override - public JComponent createCompoundEditor() { + public @NotNull JComponent createCompoundEditor() { if (myComponent == null) { myComponent = doCreateComponent(); } diff --git a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditor.java b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditor.java index e44017affd07..51e45cb25670 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditor.java @@ -21,7 +21,7 @@ public abstract class SettingsEditor implements Disposable { private final List> myListeners = ContainerUtil.createLockFreeCopyOnWriteList(); private UserActivityWatcher myWatcher; private boolean myIsInUpdate = false; - private final Factory mySettingsFactory; + private final Factory mySettingsFactory; private CompositeSettingsEditor myOwner; private JComponent myEditorComponent; @@ -38,7 +38,7 @@ public abstract class SettingsEditor implements Disposable { this(null); } - public SettingsEditor(@Nullable Factory settingsFactory) { + public SettingsEditor(@Nullable Factory settingsFactory) { mySettingsFactory = settingsFactory; Disposer.register(this, new Disposable() { @Override @@ -66,7 +66,7 @@ public abstract class SettingsEditor implements Disposable { return myOwner; } - public Factory getFactory() { + public Factory getFactory() { return mySettingsFactory; }