MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: notnull, fix types in signatures

Browse Source 
GitOrigin-RevId: 041bb6022f87ec744d28648f58d90e6b4a3b7a3b
This commit is contained in:
Alexey Kudravtsev
2021-01-27 16:09:50 +00:00
committed by intellij-monorepo-bot
parent 2a83474c00
commit 6f151d5224
8 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/execution-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java
+5 -5
View File
@@ -36,7 +36,7 @@ import java.util.*;
import java.util.function.Function;
public class ConfigurationSettingsEditor extends CompositeSettingsEditor<RunnerAndConfigurationSettings> {
private final ArrayList<SettingsEditor<RunnerAndConfigurationSettings>> myRunnerEditors = new ArrayList<>();
private final List<SettingsEditor<RunnerAndConfigurationSettings>> myRunnerEditors = new ArrayList<>();
private final Map<ProgramRunner, List<SettingsEditor>> myRunner2UnwrappedEditors = new HashMap<>();
private RunnersEditorComponent myRunnersComponent;
private final RunConfiguration myConfiguration;
@@ -45,7 +45,7 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor<RunnerA
private GroupSettingsBuilder<RunnerAndConfigurationSettings> myGroupSettingsBuilder;
@Override
public CompositeSettingsBuilder<RunnerAndConfigurationSettings> getBuilder() {
public @NotNull CompositeSettingsBuilder<RunnerAndConfigurationSettings> getBuilder() {
init();
myGroupSettingsBuilder = new GroupSettingsBuilder<>(myCompound);
return myGroupSettingsBuilder;
@@ -84,15 +84,15 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor<RunnerA
myCompound.addEditor(getRunnersTabName(),
new CompositeSettingsEditor<>(getFactory()) {
@Override
public CompositeSettingsBuilder<RunnerAndConfigurationSettings> getBuilder() {
public @NotNull CompositeSettingsBuilder<RunnerAndConfigurationSettings> getBuilder() {
return new CompositeSettingsBuilder<>() {
@Override
public Collection<SettingsEditor<RunnerAndConfigurationSettings>> getEditors() {
public @NotNull Collection<SettingsEditor<RunnerAndConfigurationSettings>> getEditors() {
return myRunnerEditors;
}
@Override
public JComponent createCompoundEditor() {
public @NotNull JComponent createCompoundEditor() {
return myRunnersComponent.getComponent();
}
};
platform/execution-impl/src/com/intellij/execution/ui/RunnerAndConfigurationSettingsEditor.java
+2 -2
View File
@@ -25,12 +25,12 @@ public class RunnerAndConfigurationSettingsEditor extends SettingsEditor<RunnerA
TargetAwareRunConfigurationEditor {
private final RunConfigurationFragmentedEditor<RunConfigurationBase<?>> myConfigurationEditor;
private final Consumer<JComponent> myConfigurationCreator;
private final Consumer<? super JComponent> myConfigurationCreator;
private final @Nullable RunConfigurationStorageUi myRCStorageUi;
public RunnerAndConfigurationSettingsEditor(RunnerAndConfigurationSettings settings,
RunConfigurationFragmentedEditor<RunConfigurationBase<?>> configurationEditor,
Consumer<JComponent> configurationCreator) {
Consumer<? super JComponent> configurationCreator) {
super(settings.createFactory());
myConfigurationEditor = configurationEditor;
myConfigurationCreator = configurationCreator;
platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsBuilder.java
+2 -2
View File
@@ -69,12 +69,12 @@ public class FragmentedSettingsBuilder<Settings> implements CompositeSettingsBui
}
@Override
public Collection<SettingsEditor<Settings>> getEditors() {
public @NotNull Collection<SettingsEditor<Settings>> 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());
platform/platform-api/src/com/intellij/execution/ui/FragmentedSettingsEditor.java
+1 -1
View File
@@ -71,7 +71,7 @@ public abstract class FragmentedSettingsEditor<Settings extends FragmentedSettin
}
@Override
public CompositeSettingsBuilder<Settings> getBuilder() {
public @NotNull CompositeSettingsBuilder<Settings> getBuilder() {
return new FragmentedSettingsBuilder<>(getFragments(), null);
}
platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsBuilder.java
+4
View File
@@ -15,10 +15,14 @@
*/
package com.intellij.openapi.options;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.Collection;
public interface CompositeSettingsBuilder<Settings> {
@NotNull
Collection<SettingsEditor<Settings>> getEditors();
@NotNull
JComponent createCompoundEditor();
}
platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java
+2 -1
View File
@@ -25,7 +25,7 @@ public abstract class CompositeSettingsEditor<Settings> extends SettingsEditor<S
public CompositeSettingsEditor() {}
public CompositeSettingsEditor(@Nullable Factory<Settings> factory) {
public CompositeSettingsEditor(@Nullable Factory<? extends Settings> factory) {
super(factory);
if (factory != null) {
@@ -33,6 +33,7 @@ public abstract class CompositeSettingsEditor<Settings> extends SettingsEditor<S
}
}
@NotNull
public abstract CompositeSettingsBuilder<Settings> getBuilder();
@Override
platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java
+3 -2
View File
@@ -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<T> implements CompositeSettingsBuilder<T> {
}
@Override
public Collection<SettingsEditor<T>> getEditors() {
public @NotNull Collection<SettingsEditor<T>> getEditors() {
List<SettingsEditor<T>> result = new ArrayList<>();
List<Pair<String,SettingsEditor<T>>> editors = myGroup.getEditors();
for (int i = 0; i < editors.size(); i++) {
@@ -45,7 +46,7 @@ public class GroupSettingsBuilder<T> implements CompositeSettingsBuilder<T> {
}
@Override
public JComponent createCompoundEditor() {
public @NotNull JComponent createCompoundEditor() {
if (myComponent == null) {
myComponent = doCreateComponent();
}
platform/platform-api/src/com/intellij/openapi/options/SettingsEditor.java
+3 -3
View File
@@ -21,7 +21,7 @@ public abstract class SettingsEditor<Settings> implements Disposable {
private final List<SettingsEditorListener<Settings>> myListeners = ContainerUtil.createLockFreeCopyOnWriteList();
private UserActivityWatcher myWatcher;
private boolean myIsInUpdate = false;
private final Factory<Settings> mySettingsFactory;
private final Factory<? extends Settings> mySettingsFactory;
private CompositeSettingsEditor<Settings> myOwner;
private JComponent myEditorComponent;
@@ -38,7 +38,7 @@ public abstract class SettingsEditor<Settings> implements Disposable {
this(null);
}
public SettingsEditor(@Nullable Factory<Settings> settingsFactory) {
public SettingsEditor(@Nullable Factory<? extends Settings> settingsFactory) {
mySettingsFactory = settingsFactory;
Disposer.register(this, new Disposable() {
@Override
@@ -66,7 +66,7 @@ public abstract class SettingsEditor<Settings> implements Disposable {
return myOwner;
}
public Factory<Settings> getFactory() {
public Factory<? extends Settings> getFactory() {
return mySettingsFactory;
}