Fixes #307 (sources)

JPL-IMCE · Oct 13, 2018 · 8266829 · 8266829
1 parent aff120c
commit 8266829
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/plugins/gov.nasa.jpl.imce.oml.zip/src/gov/nasa/jpl/imce/oml/zip/OMLSpecificationTables.xtend b/plugins/gov.nasa.jpl.imce.oml.zip/src/gov/nasa/jpl/imce/oml/zip/OMLSpecificationTables.xtend
@@ -3708,16 +3708,16 @@ class OMLSpecificationTables {
   	  val oml = createNumericScalarRestriction()
   	  val uuid = kv.remove("uuid")
   	  val minExclusive_value = kv.remove("minExclusive")
-  	  if (null !== minExclusive_value && minExclusive_value.length > 0)
+  	  if (null !== minExclusive_value && "null" != minExclusive_value && minExclusive_value.length > 0)
   	  	oml.minExclusive = OMLTables.toLiteralNumber(minExclusive_value)
   	  val minInclusive_value = kv.remove("minInclusive")
-  	  if (null !== minInclusive_value && minInclusive_value.length > 0)
+  	  if (null !== minInclusive_value && "null" != minInclusive_value && minInclusive_value.length > 0)
   	  	oml.minInclusive = OMLTables.toLiteralNumber(minInclusive_value)
   	  val maxExclusive_value = kv.remove("maxExclusive")
-  	  if (null !== maxExclusive_value && maxExclusive_value.length > 0)
+  	  if (null !== maxExclusive_value && "null" != maxExclusive_value && maxExclusive_value.length > 0)
   	  	oml.maxExclusive = OMLTables.toLiteralNumber(maxExclusive_value)
   	  val maxInclusive_value = kv.remove("maxInclusive")
-  	  if (null !== maxInclusive_value && maxInclusive_value.length > 0)
+  	  if (null !== maxInclusive_value && "null" != maxInclusive_value && maxInclusive_value.length > 0)
   	  	oml.maxInclusive = OMLTables.toLiteralNumber(maxInclusive_value)
   	  oml.name = OMLTables.toLocalName(kv.remove("name"))
   	  val pair = new Pair<NumericScalarRestriction, Map<String,String>>(oml, kv)
@@ -3825,16 +3825,16 @@ class OMLSpecificationTables {
   	  val oml = createTimeScalarRestriction()
   	  val uuid = kv.remove("uuid")
   	  val minExclusive_value = kv.remove("minExclusive")
-  	  if (null !== minExclusive_value && minExclusive_value.length > 0)
+  	  if (null !== minExclusive_value && "null" != minExclusive_value && minExclusive_value.length > 0)
   	  	oml.minExclusive = OMLTables.toLiteralDateTime(minExclusive_value)
   	  val minInclusive_value = kv.remove("minInclusive")
-  	  if (null !== minInclusive_value && minInclusive_value.length > 0)
+  	  if (null !== minInclusive_value && "null" != minInclusive_value && minInclusive_value.length > 0)
   	  	oml.minInclusive = OMLTables.toLiteralDateTime(minInclusive_value)
   	  val maxExclusive_value = kv.remove("maxExclusive")
-  	  if (null !== maxExclusive_value && maxExclusive_value.length > 0)
+  	  if (null !== maxExclusive_value && "null" != maxExclusive_value && maxExclusive_value.length > 0)
   	  	oml.maxExclusive = OMLTables.toLiteralDateTime(maxExclusive_value)
   	  val maxInclusive_value = kv.remove("maxInclusive")
-  	  if (null !== maxInclusive_value && maxInclusive_value.length > 0)
+  	  if (null !== maxInclusive_value && "null" != maxInclusive_value && maxInclusive_value.length > 0)
   	  	oml.maxInclusive = OMLTables.toLiteralDateTime(maxInclusive_value)
   	  oml.name = OMLTables.toLocalName(kv.remove("name"))
   	  val pair = new Pair<TimeScalarRestriction, Map<String,String>>(oml, kv)