[Treebase-guts] SF.net SVN: treebase:[860] trunk/treebase-core/src/main/java/org/cipres/ treebase/service/nexus

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

Revision: 860
          http://treebase.svn.sourceforge.net/treebase/?rev=860&view=rev
Author:   rvos
Date:     2011-05-12 20:34:56 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Overloaded serialize for the case where we both have a NexusDataSet (generated de novo, e.g. when creating a tree to download) and a Study (the one containing the tree). We need the study, it seems, for some housekeeping, (well, at least to avoid an NPE)

Modified Paths:
--------------
    trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceNexml.java
    trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceRDFa.java

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceNexml.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceNexml.java	2011-05-12 20:32:51 UTC (rev 859)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceNexml.java	2011-05-12 20:34:56 UTC (rev 860)
@@ -96,6 +96,11 @@
 		NexmlDocumentConverter ndc = getNexmlDocumentConverter(null, properties);
 		return ndc.fromTreeBaseToXml(nexusDataSet).getXmlString();
 	}
+	
+	public String serialize(NexusDataSet nexusDataSet, Properties properties,Study study) {
+		NexmlDocumentConverter ndc = getNexmlDocumentConverter(study, properties);
+		return ndc.fromTreeBaseToXml(nexusDataSet).getXmlString();
+	}	
 
 	public String serialize(Study study, Properties properties) {
 		NexmlDocumentConverter ndc = getNexmlDocumentConverter(study, properties);

Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceRDFa.java
===================================================================
--- trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceRDFa.java	2011-05-12 20:32:51 UTC (rev 859)
+++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/nexus/NexusServiceRDFa.java	2011-05-12 20:34:56 UTC (rev 860)
@@ -56,6 +56,14 @@
 	/**
 	 * 
 	 */
+	public String serialize(NexusDataSet nexusDataSet,Properties properties,Study study) {
+		NexmlDocumentConverter ndc = getNexmlDocumentConverter(study, properties);
+		return transform(ndc.fromTreeBaseToXml(nexusDataSet).getXmlString());
+	}	
+	
+	/**
+	 * 
+	 */
 	public String serialize(NexusDataSet nexusDataSet) {
 		NexmlDocumentConverter ndc = getNexmlDocumentConverter(null, null);
 		return transform(ndc.fromTreeBaseToXml(nexusDataSet).getXmlString());		


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