Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Fix NPE.

Authordjarvis <email>
Date2016-12-29 12:07:24 GMT-0800
Commit966ba87d90f53b6b2c67a680273549496e25c4fd
Parentb12479f
Delta11 lines added, 4 lines removed, 7-line increase
src/main/java/com/scrivenvar/definition/DefinitionPane.java
*/
private TreeItem<String> sanitize( final TreeItem<String> item ) {
- final TreeItem<String> result = item == getTreeRoot()
- ? getFirst( item.getChildren() )
- : item;
+ TreeItem<String> result;
- return result == null ? item : result;
+ if( item == null ) {
+ result = getTreeRoot();
+ }
+ else {
+ result = item == getTreeRoot()
+ ? getFirst( item.getChildren() )
+ : item;
+ }
+
+ return result;
}