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

WEB-33544 Clean up empty items on saving JSON schema mappings

Browse Source
This commit is contained in:
Anton Lobov
2018-06-27 14:18:43 +02:00
parent 8a09eababe
commit 323713eb89
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/settings/mappings/JsonSchemaMappingsView.java
+6 -2
View File
@@ -7,7 +7,6 @@ import com.intellij.json.JsonBundle;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.CommonShortcuts;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.ComboBox;
@@ -47,9 +46,11 @@ import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import static com.jetbrains.jsonSchema.remote.JsonFileResolver.isHttpPath;
@@ -170,7 +171,10 @@ public class JsonSchemaMappingsView implements Disposable {
}
public List<UserDefinedJsonSchemaConfiguration.Item> getData() {
return myTableView.getListTableModel().getItems();
return Collections.unmodifiableList(
myTableView.getListTableModel().getItems().stream()
.filter(i -> i.mappingKind == JsonMappingKind.Directory || !StringUtil.isEmpty(i.path))
.collect(Collectors.toList()));
}
public void setItems(String schemaFilePath,