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

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

Revision: 946
          http://treebase.svn.sourceforge.net/treebase/?rev=946&view=rev
Author:   rvos
Date:     2011-08-25 14:39:44 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
Actually, the skos:historyNote should probably be attached to the characters, not the study

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

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java	2011-08-25 14:35:13 UTC (rev 945)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/nexus/nexml/NexmlMatrixConverter.java	2011-08-25 14:39:44 UTC (rev 946)
@@ -179,7 +179,7 @@
 		CategoricalMatrix xmlMatrix = getDocument().createCategoricalMatrix(xmlOTUs);
 		
 		// attach base uri and history note
-		getDocument().addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
+		xmlMatrix.addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
 		xmlMatrix.setBaseURI(mMatrixBaseURI);
 		
 		List<List<DiscreteCharState>> tbStateLabels = tbMatrix.getStateLabels();
@@ -232,7 +232,7 @@
 		
 		// attach base uri and history note
 		xmlMatrix.setBaseURI(mMatrixBaseURI);
-		getDocument().addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
+		xmlMatrix.addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
 		
 		// lookup the equivalent state in tb and attach identifiers
 		for(StateSet tbStateSet : tbMatrix.getStateSets() ) {
@@ -267,7 +267,7 @@
 		
 		// attach base uri and history note
 		xmlMatrix.setBaseURI(mMatrixBaseURI);
-		getDocument().addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
+		xmlMatrix.addAnnotationValue("skos:historyNote", Constants.SKOSURI, "Mapped from TreeBASE schema using NexmlMatrixConverter $Rev$");
 		
 		for ( MatrixColumn tbColumn : tbMatrix.getColumnsReadOnly() ) {
 			org.nexml.model.Character xmlCharacter = xmlMatrix.createCharacter();

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