[Treebase-guts] SF.net SVN: treebase:[1025] trunk/treebase-core/src/main/java/org/cipres/ treebase/domain/nexus/nexml/NexmlMatrixWriter.java

[<rv...@us...>]

Revision: 1025
          http://treebase.svn.sourceforge.net/treebase/?rev=1025&view=rev
Author:   rvos
Date:     2012-01-31 21:10:45 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Added test to ensure a missing state has been seen in the matrix.

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixWriter.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixWriter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixWriter.java	2012-01-31 20:53:32 UTC (rev 1024)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixWriter.java	2012-01-31 21:10:45 UTC (rev 1025)
@@ -103,7 +103,9 @@
 			xmlState.setLabel(symString);
 			attachTreeBaseID((Annotatable)xmlState,tbState,DiscreteCharState.class);
 		}
-		missing.setStates(xmlMissingStates);
+		if ( null != missing ) {
+			missing.setStates(xmlMissingStates);
+		}
 		
 		// then create the XML characters, assigning them all the same state set
 		List<MatrixColumn> tbColumns = tbMatrix.getColumnsReadOnly();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.