diff --git a/CHANGELOG b/CHANGELOG index 86db56ad63814bb83ac79ddd4fb93b101f209299..bc763f02f6f248c2ac299aabd0f29361a47ae8c1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,8 @@ minerva (14.0.0~beta.2) unstable; urgency=low * Bug fix: validation of project name length is provided (#950) * Bug fix: after reducing privileges on himself interface is refreshed (#948) * Bug fix: removing overlays as curator in admin panel fixed (#944) + * Bug fix: information about deprecated column is more clear about column + names (#838) -- Piotr Gawron <piotr.gawron@uni.lu> Mon, 16 Sep 2019 21:00:00 +0200 diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java index 56081e1c4f7128414d4b978223a281b7fc1797ef..323678e9977a20d4374f59498a57112474b5d0ab 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java @@ -106,8 +106,8 @@ public class OverlayRestImpl extends BaseRestImpl { private List<String> getDeprecatedColumns(Layout overlay) { try { List<String> result = new ArrayList<>(); - for (ColorSchemaColumn column : new ColorSchemaReader().getDeprecatedColumns(overlay)) { - result.add(column.name()); + for (Pair<ColorSchemaColumn, String> entry : new ColorSchemaReader().getDeprecatedColumns(overlay)) { + result.add(entry.getRight()); } return result; } catch (IOException | InvalidColorSchemaException e) { 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 3cd4e6053c6b811ec5108ee1164221bed2381157..228de145bead87b74d46288ad18782f46e3a7636 100644 --- a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java +++ b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java @@ -814,9 +814,9 @@ public class ColorSchemaReader { return readColorSchema(new ByteArrayInputStream(inputData), params); } - public List<ColorSchemaColumn> getDeprecatedColumns(Layout overlay) + public List<Pair<ColorSchemaColumn, String>> getDeprecatedColumns(Layout overlay) throws IOException, InvalidColorSchemaException { - List<ColorSchemaColumn> result = new ArrayList<>(); + List<Pair<ColorSchemaColumn, String>> result = new ArrayList<>(); if (overlay.getInputData() != null) { BufferedReader br = new BufferedReader( new InputStreamReader(new ByteArrayInputStream(overlay.getInputData().getFileContent()))); @@ -843,13 +843,14 @@ public class ColorSchemaReader { Map<ColorSchemaColumn, Integer> schemaColumns = new HashMap<>(); parseColumns(columns, schemaColumns, type); for (ColorSchemaColumn column : schemaColumns.keySet()) { + Pair<ColorSchemaColumn, String> entry = new Pair<>(column, columns[schemaColumns.get(column)]); try { Field f = ColorSchemaColumn.class.getField(column.name()); if (f.isAnnotationPresent(Deprecated.class)) { - result.add(column); + result.add(entry); } else if (column.getDepractedColumnName() != null && column.getDepractedColumnName().equalsIgnoreCase(columns[schemaColumns.get(column)])) { - result.add(column); + result.add(entry); } } catch (NoSuchFieldException | SecurityException e) { throw new InvalidStateException(e);