From c75dcd263d397df8a5350ffe9f2f8dc17811bd54 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 21 Dec 2018 10:24:39 +0100
Subject: [PATCH] when uploading data with single column ignore type of data
overlay
---
.../lcsb/mapviewer/services/utils/ColorSchemaReader.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
index ac63d29259..4d54c42bc2 100644
--- a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
+++ b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
@@ -96,10 +96,10 @@ public class ColorSchemaReader {
*/
public Collection<ColorSchema> readColorSchema(InputStream colorInputStream, Map<String, String> params)
throws IOException, InvalidColorSchemaException {
- if (params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE) == null) {
- if (Integer.valueOf(params.get(TextFileUtils.COLUMN_COUNT_PARAM)) == 1) {
- return readSimpleNameColorSchema(colorInputStream);
- } else {
+ if (Integer.valueOf(params.get(TextFileUtils.COLUMN_COUNT_PARAM)) == 1) {
+ return readSimpleNameColorSchema(colorInputStream);
+ } else if (params.get(ZipEntryFileFactory.LAYOUT_HEADER_PARAM_TYPE) == null) {
+ {
return readGenericColorSchema(colorInputStream);
}
} else {
--
GitLab