Bugfix to logic when boolean values are null for AnnotationModel

bbimber · bbimber · commit 959890df5cdb · 2023-12-20T09:44:18.000-08:00
diff --git a/mGAP/src/org/labkey/mgap/jbrowse/AnnotationModel.java b/mGAP/src/org/labkey/mgap/jbrowse/AnnotationModel.java
@@ -167,7 +167,8 @@ public void setHidden(Boolean hidden)
 
     public boolean isIndexed()
     {
-        return _isIndexed == null || _isIndexed;
+        // Defaults to false when null
+        return _isIndexed != null && _isIndexed;
     }
 
     public void setIndexed(Boolean indexed)
@@ -187,7 +188,8 @@ public void setAllowableValues(String allowableValues)
 
     public Boolean isInDefaultColumns()
     {
-        return _inDefaultColumns;
+        // Defaults to false when null
+        return _inDefaultColumns != null && _inDefaultColumns;
     }
 
     public void setInDefaultColumns(Boolean inDefaultColumns)

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ public void setHidden(Boolean hidden)`
`167`	`167`
`168`	`168`	`public boolean isIndexed()`
`169`	`169`	`{`
`170`		`- return _isIndexed == null \|\| _isIndexed;`
	`170`	`+ // Defaults to false when null`
	`171`	`+ return _isIndexed != null && _isIndexed;`
`171`	`172`	`}`
`172`	`173`
`173`	`174`	`public void setIndexed(Boolean indexed)`
`@@ -187,7 +188,8 @@ public void setAllowableValues(String allowableValues)`
`187`	`188`
`188`	`189`	`public Boolean isInDefaultColumns()`
`189`	`190`	`{`
`190`		`- return _inDefaultColumns;`
	`191`	`+ // Defaults to false when null`
	`192`	`+ return _inDefaultColumns != null && _inDefaultColumns;`
`191`	`193`	`}`
`192`	`194`
`193`	`195`	`public void setInDefaultColumns(Boolean inDefaultColumns)`