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 — add NotNull

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-12-01 17:44:10 +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
java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
+5 -5
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)) {
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+3 -3
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("\\$", "\\.") : "");
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java
+4 -4
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()
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
+2 -2
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);
java/execution/impl/src/com/intellij/execution/scratch/JavaScratchConfigurable.java
+3 -2
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("\\$", "\\.") : "");