MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup — add NotNull

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-12-01 17:41:58 +01:00
parent 94a5adacd7
commit e1efcd8d0d
36 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
View File

@@ -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());

10
java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
View File

@@ -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<AppletConfiguration> 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<AppletConfiguration.AppletParameter> 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)) {

6
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
View File

@@ -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<ApplicationConfigura
myAnchor = UIUtil.mergeComponentsWithAnchor(myMainClass, myCommonProgramParameters, myJrePathEditor, myModule);
}
public void applyEditorTo(final ApplicationConfiguration configuration) throws ConfigurationException {
public void applyEditorTo(@NotNull final ApplicationConfiguration configuration) throws ConfigurationException {
myCommonProgramParameters.applyTo(configuration);
myModuleSelector.applyTo(configuration);
final String className = getMainClassField().getText();
@@ -81,7 +81,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
updateShowSwingInspector(configuration);
}
public void resetEditorFrom(final ApplicationConfiguration configuration) {
public void resetEditorFrom(@NotNull final ApplicationConfiguration configuration) {
myCommonProgramParameters.reset(configuration);
myModuleSelector.reset(configuration);
getMainClassField().setText(configuration.MAIN_CLASS_NAME != null ? configuration.MAIN_CLASS_NAME.replaceAll("\\$", "\\.") : "");

8
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java
View File

@@ -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.
@@ -16,9 +16,9 @@
package com.intellij.execution.jar;
import com.intellij.application.options.ModulesComboBox;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.execution.ui.DefaultJreSelector;
import com.intellij.execution.ui.JrePathEditor;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SettingsEditor;
@@ -52,7 +52,7 @@ public class JarApplicationConfigurable extends SettingsEditor<JarApplicationCon
myJrePathEditor.setDefaultJreSelector(DefaultJreSelector.fromModuleDependencies(modulesComboBox, true));
}
public void applyEditorTo(final JarApplicationConfiguration configuration) throws ConfigurationException {
public void applyEditorTo(@NotNull final JarApplicationConfiguration configuration) throws ConfigurationException {
myCommonProgramParameters.applyTo(configuration);
configuration.setAlternativeJrePath(myJrePathEditor.getJrePathOrName());
configuration.setAlternativeJrePathEnabled(myJrePathEditor.isAlternativeJreSelected());
@@ -60,7 +60,7 @@ public class JarApplicationConfigurable extends SettingsEditor<JarApplicationCon
configuration.setModule(myModuleComponent.getComponent().getSelectedModule());
}
public void resetEditorFrom(final JarApplicationConfiguration configuration) {
public void resetEditorFrom(@NotNull final JarApplicationConfiguration configuration) {
myCommonProgramParameters.reset(configuration);
myJarPathComponent.getComponent().setText(FileUtil.toSystemDependentName(configuration.getJarPath()));
myJrePathEditor.setPathOrName(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled()

4
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
View File

@@ -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.
@@ -150,7 +150,7 @@ public class RemoteConfigurable extends SettingsEditor<RemoteConfiguration> {
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);

5
java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
View File

@@ -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<JavaScratchConfigura
}
@Override
public void applyEditorTo(JavaScratchConfiguration configuration) throws ConfigurationException {
public void applyEditorTo(@NotNull JavaScratchConfiguration configuration) throws ConfigurationException {
myCommonProgramParameters.applyTo(configuration);
myModuleSelector.applyTo(configuration);
configuration.MAIN_CLASS_NAME = myMainClass.getComponent().getText().trim();
@@ -132,7 +133,7 @@ public class JavaScratchConfigurable extends SettingsEditor<JavaScratchConfigura
}
@Override
public void resetEditorFrom(JavaScratchConfiguration configuration) {
public void resetEditorFrom(@NotNull JavaScratchConfiguration configuration) {
myCommonProgramParameters.reset(configuration);
myModuleSelector.reset(configuration);
myMainClass.getComponent().setText(configuration.MAIN_CLASS_NAME != null ? configuration.MAIN_CLASS_NAME.replaceAll("\\$", "\\.") : "");

19
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfigurationEditor.java
View File

@@ -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 com.intellij.openapi.externalSystem.service.execution;
import com.intellij.openapi.externalSystem.model.ProjectSystemId;
@@ -24,13 +39,13 @@ public class ExternalSystemRunConfigurationEditor extends SettingsEditor<Externa
}
@Override
protected void resetEditorFrom(ExternalSystemRunConfiguration s) {
protected void resetEditorFrom(@NotNull ExternalSystemRunConfiguration s) {
myControl.setOriginalSettings(s.getSettings());
myControl.reset();
}
@Override
protected void applyEditorTo(ExternalSystemRunConfiguration s) throws ConfigurationException {
protected void applyEditorTo(@NotNull ExternalSystemRunConfiguration s) throws ConfigurationException {
myControl.apply(s.getSettings());
}

6
platform/lang-api/src/com/intellij/execution/configurations/UnknownRunConfiguration.java
View File

@@ -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.
@@ -174,11 +174,11 @@ public class UnknownRunConfiguration implements RunConfiguration, WithoutOwnBefo
}
@Override
protected void resetEditorFrom(final UnknownRunConfiguration s) {
protected void resetEditorFrom(@NotNull final UnknownRunConfiguration s) {
}
@Override
protected void applyEditorTo(final UnknownRunConfiguration s) throws ConfigurationException {
protected void applyEditorTo(@NotNull final UnknownRunConfiguration s) throws ConfigurationException {
}
@Override

6
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java
View File

@@ -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.
@@ -217,7 +217,7 @@ public class LogConfigurationPanel<T extends RunConfigurationBase> extends Setti
}
@Override
protected void resetEditorFrom(final RunConfigurationBase configuration) {
protected void resetEditorFrom(@NotNull final RunConfigurationBase configuration) {
ArrayList<LogFileOptions> list = new ArrayList<>();
final List<LogFileOptions> logFiles = configuration.getLogFiles();
for (LogFileOptions setting : logFiles) {
@@ -249,7 +249,7 @@ public class LogConfigurationPanel<T extends RunConfigurationBase> 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();

7
platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationSettingsEditor.java
View File

@@ -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<Compo
}
@Override
protected void resetEditorFrom(CompoundRunConfiguration compoundRunConfiguration) {
protected void resetEditorFrom(@NotNull CompoundRunConfiguration compoundRunConfiguration) {
myModel.clear();
myModel.addAll(compoundRunConfiguration.getSetToRun());
mySnapshot = compoundRunConfiguration;
}
@Override
protected void applyEditorTo(CompoundRunConfiguration s) throws ConfigurationException {
protected void applyEditorTo(@NotNull CompoundRunConfiguration s) throws ConfigurationException {
Set<RunConfiguration> checked = new HashSet<>();
for (int i = 0; i < myModel.getSize(); i++) {
RunConfiguration configuration = myModel.get(i);

7
platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java
View File

@@ -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<RunnerA
}
@Override
public void resetEditorFrom(RunnerAndConfigurationSettings configurationSettings) {
public void resetEditorFrom(@NotNull RunnerAndConfigurationSettings configurationSettings) {
myConfigEditor.resetFrom(configurationSettings.getConfiguration());
}
@Override
public void applyEditorTo(RunnerAndConfigurationSettings configurationSettings) throws ConfigurationException {
public void applyEditorTo(@NotNull RunnerAndConfigurationSettings configurationSettings) throws ConfigurationException {
myConfigEditor.applyTo(configurationSettings.getConfiguration());
}

6
platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
View File

@@ -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.
@@ -105,13 +105,13 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
}
@Override
public void resetEditorFrom(final RunnerAndConfigurationSettings settings) {
public void resetEditorFrom(@NotNull final RunnerAndConfigurationSettings settings) {
myEditor.resetEditorFrom(settings);
doReset(settings);
}
@Override
public void applyEditorTo(final RunnerAndConfigurationSettings settings) throws ConfigurationException {
public void applyEditorTo(@NotNull final RunnerAndConfigurationSettings settings) throws ConfigurationException {
myEditor.applyEditorTo(settings);
doApply(settings);
}

6
platform/platform-api/src/com/intellij/openapi/options/CompositeSettingsEditor.java
View File

@@ -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.
@@ -45,7 +45,7 @@ public abstract class CompositeSettingsEditor<Settings> extends SettingsEditor<S
public abstract CompositeSettingsBuilder<Settings> getBuilder();
public void resetEditorFrom(Settings settings) {
public void resetEditorFrom(@NotNull Settings settings) {
for (final SettingsEditor<Settings> myEditor : myEditors) {
try {
myEditor.resetEditorFrom(settings);
@@ -56,7 +56,7 @@ public abstract class CompositeSettingsEditor<Settings> extends SettingsEditor<S
}
}
public void applyEditorTo(Settings settings) throws ConfigurationException {
public void applyEditorTo(@NotNull Settings settings) throws ConfigurationException {
for (final SettingsEditor<Settings> myEditor : myEditors) {
try {
myEditor.applyTo(settings);

6
platform/platform-api/src/com/intellij/openapi/options/SettingsEditorGroup.java
View File

@@ -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<T> extends SettingsEditor<T> {
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() {

6
platform/platform-api/src/com/intellij/openapi/options/SettingsEditorWrapper.java
View File

@@ -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 <Src, Dst> extends SettingsEditor<Src> {
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));
}

6
platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
View File

@@ -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<AbstractFileType> {
}
@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<AbstractFileType> {
}
@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());

6
platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudDeploymentNameEditor.java
View File

@@ -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<T extends DeploymentNameConfiguration> 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());
}

4
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java
View File

@@ -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());
}

7
plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java
View File

@@ -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;

4
plugins/coverage/src/com/intellij/execution/configurations/coverage/CoverageConfigurable.java
View File

@@ -122,7 +122,7 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
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<RunConfigurationBase> {
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());

17
plugins/devkit/src/run/PluginRunConfigurationEditor.java
View File

@@ -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<PluginRunConfiguration> implements PanelWithAnchor {
private final ModulesComboBox myModules = new ModulesComboBox();
@@ -81,7 +68,7 @@ public class PluginRunConfigurationEditor extends SettingsEditor<PluginRunConfig
}
@Override
public void resetEditorFrom(PluginRunConfiguration prc) {
public void resetEditorFrom(@NotNull PluginRunConfiguration prc) {
myModules.setSelectedModule(prc.getModule());
getVMParameters().setText(prc.VM_PARAMETERS);
getProgramParameters().setText(prc.PROGRAM_PARAMETERS);
@@ -90,7 +77,7 @@ public class PluginRunConfigurationEditor extends SettingsEditor<PluginRunConfig
@Override
public void applyEditorTo(PluginRunConfiguration prc) throws ConfigurationException {
public void applyEditorTo(@NotNull PluginRunConfiguration prc) throws ConfigurationException {
prc.setModule(myModules.getSelectedModule());
prc.VM_PARAMETERS = getVMParameters().getText();
prc.PROGRAM_PARAMETERS = getProgramParameters().getText();

4
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
View File

@@ -292,7 +292,7 @@ public class JUnitConfigurable<T extends JUnitConfiguration> 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<T extends JUnitConfiguration> 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);

19
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersSettingEditor.java
View File

@@ -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<MavenRunC
}
@Override
protected void resetEditorFrom(MavenRunConfiguration runConfiguration) {
protected void resetEditorFrom(@NotNull MavenRunConfiguration runConfiguration) {
myPanel.getData(runConfiguration.getRunnerParameters());
}
@Override
protected void applyEditorTo(MavenRunConfiguration runConfiguration) throws ConfigurationException {
protected void applyEditorTo(@NotNull MavenRunConfiguration runConfiguration) throws ConfigurationException {
myPanel.setData(runConfiguration.getRunnerParameters());
}

6
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerSettingsEditor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -38,7 +38,7 @@ public class MavenRunnerSettingsEditor extends SettingsEditor<MavenRunConfigurat
}
@Override
protected void resetEditorFrom(MavenRunConfiguration runConfiguration) {
protected void resetEditorFrom(@NotNull MavenRunConfiguration runConfiguration) {
myUseProjectSettings.setSelected(runConfiguration.getRunnerSettings() == null);
if (runConfiguration.getRunnerSettings() == null) {
@@ -51,7 +51,7 @@ public class MavenRunnerSettingsEditor extends SettingsEditor<MavenRunConfigurat
}
@Override
protected void applyEditorTo(MavenRunConfiguration runConfiguration) throws ConfigurationException {
protected void applyEditorTo(@NotNull MavenRunConfiguration runConfiguration) throws ConfigurationException {
if (myUseProjectSettings.isSelected()) {
runConfiguration.setRunnerSettings(null);
}

11
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
View File

@@ -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.
@@ -28,10 +28,10 @@ import com.intellij.execution.JavaExecutionUtil;
import com.intellij.execution.MethodBrowser;
import com.intellij.execution.configuration.BrowseModuleValueActionListener;
import com.intellij.execution.testframework.TestSearchScope;
import com.intellij.execution.ui.DefaultJreSelector;
import com.intellij.execution.ui.JrePathEditor;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.execution.ui.ConfigurationModuleSelector;
import com.intellij.execution.ui.DefaultJreSelector;
import com.intellij.execution.ui.JrePathEditor;
import com.intellij.icons.AllIcons;
import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeClassChooserFactory;
@@ -73,7 +73,6 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
public class TestNGConfigurationEditor<T extends TestNGConfiguration> extends SettingsEditor<T> implements PanelWithAnchor {
@@ -292,7 +291,7 @@ public class TestNGConfigurationEditor<T extends TestNGConfiguration> 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<T extends TestNGConfiguration> 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();

5
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
View File

@@ -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<XsltRunConfiguration> {
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);
}

4
python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java
View File

@@ -25,13 +25,13 @@ public class PyCCSettingsEditor extends SettingsEditor<PyCCRunTestConfiguration>
}
@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());
}

6
python/python-rest/src/com/jetbrains/rest/run/RestConfigurationEditor.java
View File

@@ -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<RestRunConfiguration
setAnchor(myCommonOptionsForm.getAnchor());
}
protected void resetEditorFrom(RestRunConfiguration configuration) {
protected void resetEditorFrom(@NotNull RestRunConfiguration configuration) {
AbstractPythonRunConfiguration.copyParams(configuration,
myCommonOptionsForm);
myInputFileField.setText(configuration.getInputFile());
@@ -90,7 +90,7 @@ public class RestConfigurationEditor extends SettingsEditor<RestRunConfiguration
myOpenInBrowser.setEnabled(true);
}
protected void applyEditorTo(RestRunConfiguration configuration) throws ConfigurationException {
protected void applyEditorTo(@NotNull RestRunConfiguration configuration) throws ConfigurationException {
AbstractPythonRunConfiguration.copyParams(myCommonOptionsForm, configuration);
configuration.setInputFile(myInputFileField.getText().trim());
configuration.setOutputFile(myOutputFileField.getText().trim());

4
python/src/com/jetbrains/python/run/PythonExtendedConfigurationEditor.java
View File

@@ -42,7 +42,7 @@ public class PythonExtendedConfigurationEditor<T extends AbstractPythonRunConfig
}
@Override
protected void resetEditorFrom(T s) {
protected void resetEditorFrom(@NotNull T s) {
myMainSettingsEditor.resetFrom(s);
updateCurrentEditor(s);
if (myCurrentSettingsEditor != null) {
@@ -51,7 +51,7 @@ public class PythonExtendedConfigurationEditor<T extends AbstractPythonRunConfig
}
@Override
protected void applyEditorTo(T s) throws ConfigurationException {
protected void applyEditorTo(@NotNull T s) throws ConfigurationException {
myMainSettingsEditor.applyTo(s);
boolean updated = updateCurrentEditor(s);
if (myCurrentSettingsEditor != null) {

6
python/src/com/jetbrains/python/run/PythonRunConfigurationEditor.java
View File

@@ -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,11 +31,11 @@ public class PythonRunConfigurationEditor extends SettingsEditor<PythonRunConfi
myForm = new PythonRunConfigurationForm(configuration);
}
protected void resetEditorFrom(final PythonRunConfiguration config) {
protected void resetEditorFrom(@NotNull final PythonRunConfiguration config) {
PythonRunConfiguration.copyParams(config, myForm);
}
protected void applyEditorTo(final PythonRunConfiguration config) throws ConfigurationException {
protected void applyEditorTo(@NotNull final PythonRunConfiguration config) throws ConfigurationException {
PythonRunConfiguration.copyParams(myForm, config);
}

6
python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfigurationEditor.java
View File

@@ -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.
@@ -32,11 +32,11 @@ public class PythonAtTestRunConfigurationEditor extends SettingsEditor<PythonAtT
myForm = new PythonAtTestRunConfigurationForm(project, configuration);
}
protected void resetEditorFrom(final PythonAtTestRunConfiguration config) {
protected void resetEditorFrom(@NotNull final PythonAtTestRunConfiguration config) {
PythonAtTestRunConfiguration.copyParams(config, myForm);
}
protected void applyEditorTo(final PythonAtTestRunConfiguration config) throws ConfigurationException {
protected void applyEditorTo(@NotNull final PythonAtTestRunConfiguration config) throws ConfigurationException {
PythonAtTestRunConfiguration.copyParams(myForm, config);
}

6
python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfigurationEditor.java
View File

@@ -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.
@@ -32,11 +32,11 @@ public class PythonDocTestRunConfigurationEditor extends SettingsEditor<PythonDo
myForm = new PythonDocTestRunConfigurationForm(project, configuration);
}
protected void resetEditorFrom(final PythonDocTestRunConfiguration config) {
protected void resetEditorFrom(@NotNull final PythonDocTestRunConfiguration config) {
PythonDocTestRunConfiguration.copyParams(config, myForm);
}
protected void applyEditorTo(final PythonDocTestRunConfiguration config) throws ConfigurationException {
protected void applyEditorTo(@NotNull final PythonDocTestRunConfiguration config) throws ConfigurationException {
PythonDocTestRunConfiguration.copyParams(myForm, config);
}

6
python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfigurationEditor.java
View File

@@ -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.
@@ -32,11 +32,11 @@ public class PythonNoseTestRunConfigurationEditor extends SettingsEditor<PythonN
myForm = new PythonNoseTestRunConfigurationForm(project, configuration);
}
protected void resetEditorFrom(final PythonNoseTestRunConfiguration config) {
protected void resetEditorFrom(@NotNull final PythonNoseTestRunConfiguration config) {
PythonNoseTestRunConfiguration.copyParams(config, myForm);
}
protected void applyEditorTo(final PythonNoseTestRunConfiguration config) throws ConfigurationException {
protected void applyEditorTo(@NotNull final PythonNoseTestRunConfiguration config) throws ConfigurationException {
PythonNoseTestRunConfiguration.copyParams(myForm, config);
}

6
python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationEditor.java
View File

@@ -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.
@@ -84,7 +84,7 @@ public class PyTestConfigurationEditor extends SettingsEditor<PyTestRunConfigura
setAnchor(myCommonOptionsForm.getAnchor());
}
protected void resetEditorFrom(PyTestRunConfiguration s) {
protected void resetEditorFrom(@NotNull PyTestRunConfiguration s) {
AbstractPythonRunConfiguration.copyParams(s, myCommonOptionsForm);
myKeywordsTextField.setText(s.getKeywords());
myTestScriptTextField.setText(s.getTestToRun());
@@ -93,7 +93,7 @@ public class PyTestConfigurationEditor extends SettingsEditor<PyTestRunConfigura
myParamsTextField.setText(s.getParams());
}
protected void applyEditorTo(PyTestRunConfiguration s) throws ConfigurationException {
protected void applyEditorTo(@NotNull PyTestRunConfiguration s) throws ConfigurationException {
AbstractPythonRunConfiguration.copyParams(myCommonOptionsForm, s);
s.setTestToRun(myTestScriptTextField.getText().trim());
s.setKeywords(myKeywordsTextField.getText().trim());

6
python/src/com/jetbrains/python/testing/tox/PyToxConfigurationSettings.java
View File

@@ -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.
@@ -50,7 +50,7 @@ final class PyToxConfigurationSettings extends SettingsEditor<PyToxConfiguration
}
@Override
protected void applyEditorTo(final PyToxConfiguration s) {
protected void applyEditorTo(@NotNull final PyToxConfiguration s) {
AbstractPythonRunConfiguration.copyParams(myForm, s);
s.setArguments(asArray(myArgumentsField));
s.setRunOnlyEnvs(asArray(myRunOnlyTestsField));
@@ -66,7 +66,7 @@ final class PyToxConfigurationSettings extends SettingsEditor<PyToxConfiguration
}
@Override
protected void resetEditorFrom(final PyToxConfiguration s) {
protected void resetEditorFrom(@NotNull final PyToxConfiguration s) {
AbstractPythonRunConfiguration.copyParams(s, myForm);
myArgumentsField.setText(fromArray(s.getArguments()));
myRunOnlyTestsField.setText(fromArray(s.getRunOnlyEnvs()));

6
python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfigurationEditor.java
View File

@@ -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.
@@ -32,11 +32,11 @@ public class PythonUnitTestRunConfigurationEditor extends SettingsEditor<PythonU
myForm = new PythonUnitTestRunConfigurationForm(project, configuration);
}
protected void resetEditorFrom(final PythonUnitTestRunConfiguration config) {
protected void resetEditorFrom(@NotNull final PythonUnitTestRunConfiguration config) {
PythonUnitTestRunConfiguration.copyParams(config, myForm);
}
protected void applyEditorTo(final PythonUnitTestRunConfiguration config) throws ConfigurationException {
protected void applyEditorTo(@NotNull final PythonUnitTestRunConfiguration config) throws ConfigurationException {
PythonUnitTestRunConfiguration.copyParams(myForm, config);
}