From b28172714c47ef26ff7281cbdf3600544615aa1f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 12 Aug 2014 17:35:29 +0400 Subject: [PATCH] Cleanup (nullability) --- .../impl/ui/libraries/FacetLibrariesValidatorImpl.java | 3 ++- .../impl/ui/libraries/FrameworkLibraryValidatorImpl.java | 4 +++- .../src/com/intellij/facet/ui/FacetEditorValidator.java | 6 ++++-- .../com/intellij/appengine/facet/AppEngineFacetEditor.java | 3 ++- .../com/jetbrains/python/buildout/BuildoutConfigPanel.java | 3 ++- .../python/configuration/PyIntegratedToolsConfigurable.java | 3 ++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java index 63ba7def99d5..bb5735d109e0 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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,6 +72,7 @@ public class FacetLibrariesValidatorImpl extends FacetLibrariesValidator { onChange(); } + @NotNull public ValidationResult check() { if (myRequiredLibraries == null) { return ValidationResult.OK; diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FrameworkLibraryValidatorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FrameworkLibraryValidatorImpl.java index be22534d2754..36a77fc7e18a 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FrameworkLibraryValidatorImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FrameworkLibraryValidatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescri import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager; import com.intellij.openapi.util.Ref; import com.intellij.util.Processor; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Set; @@ -50,6 +51,7 @@ public class FrameworkLibraryValidatorImpl extends FrameworkLibraryValidator { myLibraryCategoryName = libraryCategoryName; } + @NotNull @Override public ValidationResult check() { final Set libraryKinds = myLibraryDescription.getSuitableLibraryKinds(); diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java index f3a6d087da35..c04efa50ba33 100644 --- a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java +++ b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.facet.ui; +import org.jetbrains.annotations.NotNull; + /** * @author nik */ public abstract class FacetEditorValidator { + @NotNull public abstract ValidationResult check(); } diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java index 6e45480f1156..a01878f1e29d 100644 --- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java +++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -60,6 +60,7 @@ public class AppEngineFacetEditor extends FacetEditorTab { myContext = context; mySdkEditor = new AppEngineSdkEditor(myContext.getProject()); validatorsManager.registerValidator(new FacetEditorValidator() { + @NotNull @Override public ValidationResult check() { return AppEngineSdkUtil.checkPath(mySdkEditor.getPath()); diff --git a/python/src/com/jetbrains/python/buildout/BuildoutConfigPanel.java b/python/src/com/jetbrains/python/buildout/BuildoutConfigPanel.java index 394de6160cbc..eceedeb00050 100644 --- a/python/src/com/jetbrains/python/buildout/BuildoutConfigPanel.java +++ b/python/src/com/jetbrains/python/buildout/BuildoutConfigPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -81,6 +81,7 @@ public class BuildoutConfigPanel extends JPanel { myErrorPanel.add(facetErrorPanel.getComponent(), BorderLayout.CENTER); facetErrorPanel.getValidatorsManager().registerValidator(new FacetEditorValidator() { + @NotNull @Override public ValidationResult check() { if (!myFacetEnabled) { diff --git a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java index 8afd9cc4e674..fa869bfca359 100644 --- a/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java +++ b/python/src/com/jetbrains/python/configuration/PyIntegratedToolsConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -120,6 +120,7 @@ public class PyIntegratedToolsConfigurable implements SearchableConfigurable, No myErrorPanel.add(facetErrorPanel.getComponent(), BorderLayout.CENTER); facetErrorPanel.getValidatorsManager().registerValidator(new FacetEditorValidator() { + @NotNull @Override public ValidationResult check() { final Sdk sdk = PythonSdkType.findPythonSdk(myModule);