From e1efcd8d0dfdbc6979fabec9be7a77d3b589467f Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 1 Dec 2016 17:41:58 +0100 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20add=20NotNull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cDebuggerParametersRunnerConfigurable.java | 6 +++--- .../execution/applet/AppletConfigurable.java | 10 +++++----- .../application/ApplicationConfigurable.java | 6 +++--- .../jar/JarApplicationConfigurable.java | 8 ++++---- .../execution/remote/RemoteConfigurable.java | 4 ++-- .../scratch/JavaScratchConfigurable.java | 5 +++-- .../ExternalSystemRunConfigurationEditor.java | 19 +++++++++++++++++-- .../UnknownRunConfiguration.java | 6 +++--- .../logging/LogConfigurationPanel.java | 6 +++--- ...ompoundRunConfigurationSettingsEditor.java | 7 +++---- .../impl/ConfigurationSettingsEditor.java | 7 +++---- .../ConfigurationSettingsEditorWrapper.java | 6 +++--- .../options/CompositeSettingsEditor.java | 6 +++--- .../openapi/options/SettingsEditorGroup.java | 6 +++--- .../options/SettingsEditorWrapper.java | 6 +++--- .../custom/impl/CustomFileTypeEditor.java | 6 +++--- .../util/CloudDeploymentNameEditor.java | 6 +++--- .../debugger/RemoteDebugConfiguration.java | 4 ++-- .../config/execution/AntRunConfiguration.java | 7 +++---- .../coverage/CoverageConfigurable.java | 4 ++-- .../src/run/PluginRunConfigurationEditor.java | 17 ++--------------- .../configuration/JUnitConfigurable.java | 4 ++-- .../MavenRunnerParametersSettingEditor.java | 19 +++++++++++++++++-- .../execution/MavenRunnerSettingsEditor.java | 6 +++--- .../TestNGConfigurationEditor.java | 11 +++++------ .../xpath/xslt/run/XsltRunSettingsEditor.java | 5 ++--- .../coursecreator/run/PyCCSettingsEditor.java | 4 ++-- .../rest/run/RestConfigurationEditor.java | 6 +++--- .../PythonExtendedConfigurationEditor.java | 4 ++-- .../run/PythonRunConfigurationEditor.java | 6 +++--- .../PythonAtTestRunConfigurationEditor.java | 6 +++--- .../PythonDocTestRunConfigurationEditor.java | 6 +++--- .../PythonNoseTestRunConfigurationEditor.java | 6 +++--- .../pytest/PyTestConfigurationEditor.java | 6 +++--- .../tox/PyToxConfigurationSettings.java | 6 +++--- .../PythonUnitTestRunConfigurationEditor.java | 6 +++--- 36 files changed, 133 insertions(+), 120 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java index baf7072785b9..b027a0e629d8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ public class GenericDebuggerParametersRunnerConfigurable extends SettingsEditor< } @Override - public void resetEditorFrom(GenericDebuggerRunnerSettings runnerSettings) { + public void resetEditorFrom(@NotNull GenericDebuggerRunnerSettings runnerSettings) { setIsLocal(runnerSettings.LOCAL); setTransport(runnerSettings.getTransport()); setPort(StringUtil.notNullize(runnerSettings.getDebugPort())); @@ -182,7 +182,7 @@ public class GenericDebuggerParametersRunnerConfigurable extends SettingsEditor< } @Override - public void applyEditorTo(GenericDebuggerRunnerSettings runnerSettings) throws ConfigurationException { + public void applyEditorTo(@NotNull GenericDebuggerRunnerSettings runnerSettings) throws ConfigurationException { runnerSettings.LOCAL = myIsLocal; checkPort(); runnerSettings.setDebugPort(getPort()); diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java index 6c1c8f99a0a5..a4f26ae79e56 100644 --- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java +++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ package com.intellij.execution.applet; import com.intellij.application.options.ModulesComboBox; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.impl.CheckableRunConfigurationEditor; -import com.intellij.execution.ui.DefaultJreSelector; -import com.intellij.execution.ui.JrePathEditor; import com.intellij.execution.ui.ClassBrowser; import com.intellij.execution.ui.ConfigurationModuleSelector; +import com.intellij.execution.ui.DefaultJreSelector; +import com.intellij.execution.ui.JrePathEditor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; @@ -216,14 +216,14 @@ public class AppletConfigurable extends SettingsEditor impl return s.length() == 0 ? null : s.replace(File.separatorChar, '/'); } - public void applyEditorTo(final AppletConfiguration configuration) { + public void applyEditorTo(@NotNull final AppletConfiguration configuration) { checkEditorData(configuration); myTable.stopEditing(); final List params = cloneParameters(myParameters.getItems()); configuration.setAppletParameters(params); } - public void resetEditorFrom(final AppletConfiguration configuration) { + public void resetEditorFrom(@NotNull final AppletConfiguration configuration) { getClassNameComponent().setText(configuration.MAIN_CLASS_NAME); String presentableHtmlName = configuration.HTML_FILE_NAME; if (presentableHtmlName != null && !StringUtil.startsWithIgnoreCase(presentableHtmlName, HTTP_PREFIX)) { diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java index 25ca23b0a5b4..081a97ff6303 100644 --- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java +++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class ApplicationConfigurable extends SettingsEditor { myModuleSelector.applyTo(configuration); } - public void resetEditorFrom(final RemoteConfiguration configuration) { + public void resetEditorFrom(@NotNull final RemoteConfiguration configuration) { if (!SystemInfo.isWindows) { configuration.USE_SOCKET_TRANSPORT = true; myRbShmem.setEnabled(false); diff --git a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java index 9522cd1c12c8..eeaac86b4b3d 100644 --- a/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java +++ b/java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java @@ -42,6 +42,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; +import java.awt.GridBagConstraints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -114,7 +115,7 @@ public class JavaScratchConfigurable extends SettingsEditor extends Setti } @Override - protected void resetEditorFrom(final RunConfigurationBase configuration) { + protected void resetEditorFrom(@NotNull final RunConfigurationBase configuration) { ArrayList list = new ArrayList<>(); final List logFiles = configuration.getLogFiles(); for (LogFileOptions setting : logFiles) { @@ -249,7 +249,7 @@ public class LogConfigurationPanel extends Setti } @Override - protected void applyEditorTo(final RunConfigurationBase configuration) throws ConfigurationException { + protected void applyEditorTo(@NotNull final RunConfigurationBase configuration) throws ConfigurationException { myFilesTable.stopEditing(); configuration.removeAllLogFiles(); configuration.removeAllPredefinedLogFiles(); diff --git a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java index 9d9689366312..8be37648aa44 100644 --- a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListSeparator; import com.intellij.openapi.ui.popup.MultiSelectionListPopupStep; import com.intellij.openapi.ui.popup.PopupStep; -import com.intellij.openapi.util.Condition; import com.intellij.ui.*; import com.intellij.ui.components.JBList; import com.intellij.util.containers.ContainerUtil; @@ -92,14 +91,14 @@ public class CompoundRunConfigurationSettingsEditor extends SettingsEditor checked = new HashSet<>(); for (int i = 0; i < myModel.getSize(); i++) { RunConfiguration configuration = myModel.get(i); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java index caa891634110..3c74bb97f44a 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import com.intellij.execution.configurations.RunnerSettings; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.AdjustingTabSettingsEditor; import com.intellij.openapi.options.*; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; import com.intellij.ui.ColoredListCellRenderer; @@ -304,12 +303,12 @@ public class ConfigurationSettingsEditor extends CompositeSettingsEditor extends SettingsEditor getBuilder(); - public void resetEditorFrom(Settings settings) { + public void resetEditorFrom(@NotNull Settings settings) { for (final SettingsEditor myEditor : myEditors) { try { myEditor.resetEditorFrom(settings); @@ -56,7 +56,7 @@ public abstract class CompositeSettingsEditor extends SettingsEditor myEditor : myEditors) { try { myEditor.applyTo(settings); diff --git a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorGroup.java b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorGroup.java index 9db36a17396d..f66bc6881dc0 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorGroup.java +++ b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,8 +42,8 @@ public class SettingsEditorGroup extends SettingsEditor { return myEditors; } - public void resetEditorFrom(T t) {} - public void applyEditorTo(T t) throws ConfigurationException {} + public void resetEditorFrom(@NotNull T t) {} + public void applyEditorTo(@NotNull T t) throws ConfigurationException {} @NotNull public JComponent createEditor() { diff --git a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorWrapper.java b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorWrapper.java index 003a4408fe7e..d3e746394671 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/options/SettingsEditorWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,11 +42,11 @@ public class SettingsEditorWrapper extends SettingsEditor { myWrapped.addSettingsEditorListener(myListener); } - public void resetEditorFrom(Src src) { + public void resetEditorFrom(@NotNull Src src) { myWrapped.resetFrom(mySrcToDstConvertor.convert(src)); } - public void applyEditorTo(Src src) throws ConfigurationException { + public void applyEditorTo(@NotNull Src src) throws ConfigurationException { myWrapped.applyTo(mySrcToDstConvertor.convert(src)); } diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java index be9fcfc94d22..80b3a81efa47 100644 --- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,7 +72,7 @@ public class CustomFileTypeEditor extends SettingsEditor { } @Override - public void resetEditorFrom(AbstractFileType fileType) { + public void resetEditorFrom(@NotNull AbstractFileType fileType) { myFileTypeName.setText(fileType.getName()); myFileTypeDescr.setText(fileType.getDescription()); @@ -100,7 +100,7 @@ public class CustomFileTypeEditor extends SettingsEditor { } @Override - public void applyEditorTo(AbstractFileType type) throws ConfigurationException { + public void applyEditorTo(@NotNull AbstractFileType type) throws ConfigurationException { if (myFileTypeName.getText().trim().length() == 0) { throw new ConfigurationException(IdeBundle.message("error.name.cannot.be.empty"), CommonBundle.getErrorTitle()); diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java index 590e0f0d31c5..53a349928b18 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,13 +50,13 @@ public class CloudDeploymentNameEditor ex myNameTextField.setEnabled(myCustomNameCheckBox.isSelected()); } - public void resetEditorFrom(T settings) { + public void resetEditorFrom(@NotNull T settings) { myCustomNameCheckBox.setSelected(!settings.isDefaultDeploymentName()); updateNameEnabled(); myNameTextField.setText(settings.getDeploymentName()); } - public void applyEditorTo(T settings) throws ConfigurationException { + public void applyEditorTo(@NotNull T settings) throws ConfigurationException { settings.setDefaultDeploymentName(!myCustomNameCheckBox.isSelected()); settings.setDeploymentName(myNameTextField.getText()); } diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java index 942a5c9b5138..4ffd257ae740 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java @@ -146,13 +146,13 @@ public abstract class RemoteDebugConfiguration extends LocatableConfigurationBas } @Override - protected void resetEditorFrom(RemoteDebugConfiguration configuration) { + protected void resetEditorFrom(@NotNull RemoteDebugConfiguration configuration) { hostField.setText(StringUtil.notNullize(configuration.host, "localhost")); portField.setNumber(configuration.port); } @Override - protected void applyEditorTo(RemoteDebugConfiguration configuration) { + protected void applyEditorTo(@NotNull RemoteDebugConfiguration configuration) { configuration.setHost(hostField.getText()); configuration.setPort(portField.getNumber()); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java index 9ab63018a05b..53e83c560a71 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.openapi.util.WriteExternalException; @@ -229,7 +228,7 @@ public class AntRunConfiguration extends LocatableConfigurationBase implements R } @Override - protected void resetEditorFrom(RunConfiguration s) { + protected void resetEditorFrom(@NotNull RunConfiguration s) { final AntRunConfiguration config = (AntRunConfiguration)s; myFileUrl = config.mySettings.myFileUrl; myTargetName = config.mySettings.myTargetName; @@ -238,7 +237,7 @@ public class AntRunConfiguration extends LocatableConfigurationBase implements R } @Override - protected void applyEditorTo(RunConfiguration s) throws ConfigurationException { + protected void applyEditorTo(@NotNull RunConfiguration s) throws ConfigurationException { final AntRunConfiguration config = (AntRunConfiguration)s; config.mySettings.myFileUrl = myFileUrl; config.mySettings.myTargetName = myTargetName; diff --git a/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java b/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java index ac84ede1bf88..d06925d718ad 100644 --- a/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java +++ b/plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java @@ -122,7 +122,7 @@ public class CoverageConfigurable extends SettingsEditor { myProject = config.getProject(); } - protected void resetEditorFrom(final RunConfigurationBase runConfiguration) { + protected void resetEditorFrom(@NotNull final RunConfigurationBase runConfiguration) { final boolean isJre50; if (runConfiguration instanceof CommonJavaRunConfigurationParameters && myVersionDetector.isJre50Configured((CommonJavaRunConfigurationParameters)runConfiguration)) { isJre50 = true; @@ -171,7 +171,7 @@ public class CoverageConfigurable extends SettingsEditor { return CoverageEnabledConfiguration.getOrCreate(myConfig).canHavePerTestCoverage(); } - protected void applyEditorTo(final RunConfigurationBase runConfiguration) throws ConfigurationException { + protected void applyEditorTo(@NotNull final RunConfigurationBase runConfiguration) throws ConfigurationException { final JavaCoverageEnabledConfiguration configuration = (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); configuration.setCoveragePatterns(myClassFilterEditor.getFilters()); configuration.setCoverageRunner(getSelectedRunner()); diff --git a/plugins/devkit/src/run/PluginRunConfigurationEditor.java b/plugins/devkit/src/run/PluginRunConfigurationEditor.java index aba312ea538c..abb84baa6769 100644 --- a/plugins/devkit/src/run/PluginRunConfigurationEditor.java +++ b/plugins/devkit/src/run/PluginRunConfigurationEditor.java @@ -17,37 +17,24 @@ package org.jetbrains.idea.devkit.run; import com.intellij.application.options.ModulesComboBox; import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.configurations.LogFileOptions; import com.intellij.execution.ui.DefaultJreSelector; import com.intellij.execution.ui.JrePathEditor; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.ui.PanelWithAnchor; import com.intellij.ui.RawCommandLineEditor; import com.intellij.ui.components.JBLabel; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.devkit.DevKitBundle; import org.jetbrains.idea.devkit.module.PluginModuleType; -import org.jetbrains.idea.devkit.projectRoots.IdeaJdk; -import org.jetbrains.idea.devkit.projectRoots.Sandbox; import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.io.IOException; public class PluginRunConfigurationEditor extends SettingsEditor implements PanelWithAnchor { private final ModulesComboBox myModules = new ModulesComboBox(); @@ -81,7 +68,7 @@ public class PluginRunConfigurationEditor extends SettingsEditor extends SettingsEdi if (group.getSelection() == null) group.setSelected(radioButtons[0].getModel(), true); } - public void applyEditorTo(final JUnitConfiguration configuration) { + public void applyEditorTo(@NotNull final JUnitConfiguration configuration) { myModel.apply(getModuleSelector().getModule(), configuration); configuration.getPersistentData().setChangeList((String)myChangeListLabeledComponent.getComponent().getSelectedItem()); applyHelpersTo(configuration); @@ -320,7 +320,7 @@ public class JUnitConfigurable extends SettingsEdi } } - public void resetEditorFrom(final JUnitConfiguration configuration) { + public void resetEditorFrom(@NotNull final JUnitConfiguration configuration) { final int count = configuration.getRepeatCount(); myRepeatCountField.setText(String.valueOf(count)); myRepeatCountField.setEnabled(count > 1); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersSettingEditor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersSettingEditor.java index 5e0c59d9d6ac..d3565f46f54c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersSettingEditor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersSettingEditor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.idea.maven.execution; import com.intellij.openapi.options.ConfigurationException; @@ -19,12 +34,12 @@ public class MavenRunnerParametersSettingEditor extends SettingsEditor extends SettingsEditor implements PanelWithAnchor { @@ -292,7 +291,7 @@ public class TestNGConfigurationEditor extends Se } @Override - protected void resetEditorFrom(TestNGConfiguration config) { + protected void resetEditorFrom(@NotNull TestNGConfiguration config) { this.config = config; model.reset(config); commonJavaParameters.reset(config); @@ -319,7 +318,7 @@ public class TestNGConfigurationEditor extends Se } @Override - public void applyEditorTo(TestNGConfiguration config) { + public void applyEditorTo(@NotNull TestNGConfiguration config) { model.apply(getModuleSelector().getModule(), config); getModuleSelector().applyTo(config); TestData data = config.getPersistantData(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index 6bf70bf61ab2..15c0435b2577 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -38,7 +38,6 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.TextComponentAccessor; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -596,11 +595,11 @@ class XsltRunSettingsEditor extends SettingsEditor { myProject = project; } - protected void resetEditorFrom(XsltRunConfiguration s) { + protected void resetEditorFrom(@NotNull XsltRunConfiguration s) { myEditor.resetFrom(s); } - protected void applyEditorTo(XsltRunConfiguration s) throws ConfigurationException { + protected void applyEditorTo(@NotNull XsltRunConfiguration s) throws ConfigurationException { myEditor.applyTo(s); } diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java index 806f6a02ad5e..2a7b8806e880 100644 --- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java +++ b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java @@ -25,13 +25,13 @@ public class PyCCSettingsEditor extends SettingsEditor } @Override - protected void resetEditorFrom(PyCCRunTestConfiguration s) { + protected void resetEditorFrom(@NotNull PyCCRunTestConfiguration s) { AbstractPythonRunConfiguration.copyParams(s, myForm); myPathToTestFileField.setText(s.getPathToTest()); } @Override - protected void applyEditorTo(PyCCRunTestConfiguration s) throws ConfigurationException { + protected void applyEditorTo(@NotNull PyCCRunTestConfiguration s) throws ConfigurationException { AbstractPythonRunConfiguration.copyParams(myForm, s); s.setPathToTest(myPathToTestFileField.getText()); } diff --git a/python/python-rest/src/com/jetbrains/rest/run/RestConfigurationEditor.java b/python/python-rest/src/com/jetbrains/rest/run/RestConfigurationEditor.java index c6a9f02b8a31..3c3b6d449f02 100644 --- a/python/python-rest/src/com/jetbrains/rest/run/RestConfigurationEditor.java +++ b/python/python-rest/src/com/jetbrains/rest/run/RestConfigurationEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ public class RestConfigurationEditor extends SettingsEditor