From: Sergey Simonchik Date: Mon, 11 Jan 2016 18:12:29 +0000 (+0300) Subject: WEB-19727 rsa key as env variable not working X-Git-Tag: clion/144.2951~4 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=e97c3d889a270e340a1b3ff349af18cc4fa045fe WEB-19727 rsa key as env variable not working --- diff --git a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java index 8424662d824f..7c0b4296d52a 100644 --- a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java +++ b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java @@ -30,6 +30,7 @@ import com.intellij.util.ui.ListTableModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.table.TableCellEditor; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.StringSelection; import java.util.ArrayList; @@ -93,6 +94,14 @@ public class EnvVariablesTable extends ListTableWithButtons protected String getDescription(EnvironmentVariable environmentVariable) { return environmentVariable.getDescription(); } + + @Nullable + @Override + public TableCellEditor getEditor(EnvironmentVariable variable) { + StringWithNewLinesCellEditor editor = new StringWithNewLinesCellEditor(); + editor.setClickCountToStart(1); + return editor; + } }; return new ListTableModel((new ColumnInfo[]{name, value})); diff --git a/platform/lang-api/src/com/intellij/execution/util/StringWithNewLinesCellEditor.java b/platform/lang-api/src/com/intellij/execution/util/StringWithNewLinesCellEditor.java new file mode 100644 index 000000000000..5fbc94ac5a4b --- /dev/null +++ b/platform/lang-api/src/com/intellij/execution/util/StringWithNewLinesCellEditor.java @@ -0,0 +1,34 @@ +/* + * 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.execution.util; + +import com.intellij.ui.components.JBTextField; + +import javax.swing.*; +import javax.swing.text.Document; + +public class StringWithNewLinesCellEditor extends DefaultCellEditor { + + public StringWithNewLinesCellEditor() { + super(new JBTextField() { + @Override + public void setDocument(Document doc) { + super.setDocument(doc); + doc.putProperty("filterNewlines", Boolean.FALSE); + } + }); + } +}