From febdec8cb21b77e1fb457fe4356424dedbf98b1d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 7 Dec 2016 17:41:03 +0100
Subject: [PATCH] =?UTF-8?q?nodejs=20rc=20producer=20using=20yml=20config?=
 =?UTF-8?q?=20file=20=E2=80=94=20fix=20isConfigurationFromContext=20/=20se?=
 =?UTF-8?q?tupConfigurationFromContext=20(standard=20nodejs=20rc=20should?=
 =?UTF-8?q?=20be=20not=20used=20if=20configured=20detected)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java | 2 +-
 .../platform-api/src/com/intellij/ui/RawCommandLineEditor.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java b/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
index 637a1a0123ca..fe587821cca7 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/TextFieldWithBrowseButton.java
@@ -98,7 +98,7 @@ public class TextFieldWithBrowseButton extends ComponentWithBrowseButton<JTextFi
   }
 
   @Override
-  public void setText(final String text){
+  public void setText(@Nullable String text){
     getTextField().setText(text);
   }
 
diff --git a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
index aa18a47c599e..2a8402381e3c 100644
--- a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
+++ b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.util.Function;
 import com.intellij.util.execution.ParametersListUtil;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.text.Document;
@@ -75,7 +76,7 @@ public class RawCommandLineEditor extends JPanel implements TextAccessor {
   }
 
   @Override
-  public void setText(String text) {
+  public void setText(@Nullable String text) {
     myTextField.setText(text);
   }