diff --git a/CHANGELOG b/CHANGELOG index 8b544c0a485866c34bdb2b272773e8b431d748de..484adae3d314d425d238eab492a1e117ef809120 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ minerva (12.3.1~beta.1) unstable; urgency=low * Small improvement: model_name renamed to map_name in data overlay columns (#827) + * Small improvement: name, type, reference_genome_type and + reference_genome_version column in genetic variant data overlay are + deprecated (#827) + * Bug fix: deprecated columns in data overlay are not visible to the end user + (#827) * Bug fix: invalid color in data overlay provides proper feedback to the user (#822) * Bug fix: genetic variant overlay without name caused problems (#832) 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 2471473e533dfef860ccd7392867616e2d3a4fd9..e9f87395567bbe7482cb41c7281d0f3d1169a2c4 100644 --- a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java +++ b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java @@ -7,6 +7,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -720,7 +721,15 @@ public class ColorSchemaReader { } else { String columnNames = ""; for (ColorSchemaColumn schemaColumn : ColorSchemaColumn.values()) { - if (schemaColumn.getTypes().contains(type)) { + boolean deprecated = false; + try { + Field f = ColorSchemaColumn.class.getField(schemaColumn.name()); + if (f.isAnnotationPresent(Deprecated.class)) + deprecated = true; + } catch (NoSuchFieldException | SecurityException e) { + } + + if (schemaColumn.getTypes().contains(type) && !deprecated) { columnNames += schemaColumn.getColumnName() + ", "; } } diff --git a/service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java b/service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java index 045198598e771100ee9939a54feee51d4a560485..fd9e21311645329bcab595ed843b596908abf843 100644 --- a/service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java +++ b/service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java @@ -19,7 +19,7 @@ public enum ColorSchemaColumn { /** * Name of the element. */ - NAME(new ColorSchemaType[] { ColorSchemaType.GENERIC, ColorSchemaType.GENETIC_VARIANT }), + NAME(new ColorSchemaType[] { ColorSchemaType.GENERIC}), GENE_NAME(new ColorSchemaType[] { ColorSchemaType.GENETIC_VARIANT }), @@ -43,7 +43,7 @@ public enum ColorSchemaColumn { /** * Class type of the element. */ - TYPE(new ColorSchemaType[] { ColorSchemaType.GENERIC, ColorSchemaType.GENETIC_VARIANT }), + TYPE(new ColorSchemaType[] { ColorSchemaType.GENERIC}), /** * New element/reaction color. @@ -99,11 +99,13 @@ public enum ColorSchemaColumn { /** * What's the {@link ReferenceGenomeType}. */ + @Deprecated REFERENCE_GENOME_TYPE(new ColorSchemaType[] { ColorSchemaType.GENETIC_VARIANT }), /** * {@link ReferenceGenome#version Version} of the reference genome. */ + @Deprecated REFERENCE_GENOME_VERSION(new ColorSchemaType[] { ColorSchemaType.GENETIC_VARIANT }), /**