Commit beb2f312 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

z-index is parsed properly and fields data are removed only when applicable

parent 65903e01
......@@ -3,6 +3,7 @@ package lcsb.mapviewer.converter.model.celldesigner.annotation;
import lcsb.mapviewer.converter.model.celldesigner.structure.CellDesignerElement;
import lcsb.mapviewer.converter.model.celldesigner.structure.CellDesignerSpecies;
import lcsb.mapviewer.model.map.BioEntity;
import lcsb.mapviewer.model.map.Drawable;
import lcsb.mapviewer.model.map.MiriamType;
import lcsb.mapviewer.model.map.reaction.Reaction;
import lcsb.mapviewer.model.map.species.Element;
......@@ -137,7 +138,7 @@ public enum NoteField {
TRANSPARENCY_ZOOM_LEVEL_VISIBILITY_OLD("TransparencyZoomLevelVisibility", Element.class, null),
@ImportOnly
Z_INDEX("Z-Index", BioEntity.class, null),
Z_INDEX("Z-Index", Drawable.class, null),
;
......
......@@ -768,7 +768,7 @@ public class RestAnnotationParser {
boolean remove = false;
for (NoteField field : NoteField.values()) {
if (string2.startsWith(field.getCommonName() + ":")) {
if (string2.startsWith(field.getCommonName() + ":")&& field.getClazz().isAssignableFrom(object.getClass())) {
remove = true;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment