From 96ec0cfb3c9a26ddab3f93b17bfff343cf2c49fa Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 23 Jan 2019 10:45:03 +0100
Subject: [PATCH] by default non existing boolean values in cell designer file
are resovled to "false"
---
.../model/celldesigner/structure/CellDesignerSpecies.java | 2 +-
.../converter/model/celldesigner/structure/SpeciesTest.java | 4 +++-
.../main/java/lcsb/mapviewer/model/map/species/Species.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerSpecies.java b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerSpecies.java
index 58a84bd10a..d44dd3c3c3 100644
--- a/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerSpecies.java
+++ b/converter-CellDesigner/src/main/java/lcsb/mapviewer/converter/model/celldesigner/structure/CellDesignerSpecies.java
@@ -523,7 +523,7 @@ public class CellDesignerSpecies<T extends Species> extends CellDesignerElement<
throw new InvalidArgumentException(errorMessage);
}
} else {
- result = null;
+ result = false;
}
return result;
}
diff --git a/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/structure/SpeciesTest.java b/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/structure/SpeciesTest.java
index 733e2a7dbd..49cd34090f 100644
--- a/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/structure/SpeciesTest.java
+++ b/converter-CellDesigner/src/test/java/lcsb/mapviewer/converter/model/celldesigner/structure/SpeciesTest.java
@@ -312,8 +312,10 @@ public class SpeciesTest extends CellDesignerTestFunctions {
}
species.setOnlySubstanceUnits("false");
assertFalse(species.getOnlySubstanceUnits());
+
+ species.setOnlySubstanceUnits("true");
species.setOnlySubstanceUnits((String) null);
- assertNull(species.getOnlySubstanceUnits());
+ assertFalse(species.getOnlySubstanceUnits());
} catch (Exception e) {
e.printStackTrace();
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/species/Species.java b/model/src/main/java/lcsb/mapviewer/model/map/species/Species.java
index 7a396ac047..35059f3b86 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/species/Species.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/species/Species.java
@@ -97,7 +97,7 @@ public abstract class Species extends Element {
/**
* Is only substance units allowed.
*/
- private Boolean onlySubstanceUnits = null;
+ private Boolean onlySubstanceUnits = false;
/**
* How many dimers are in this species.
--
GitLab