[ismrmrd] 134/281: added JAXB marshalling function to java bindings.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 4d5b6b0e7cca92c9a2fc8c463a894ba3513793c7
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Mon Apr 8 09:17:51 2013 -0400

    added JAXB marshalling function to java bindings.
---
 bindings/java/CMakeLists.txt |  6 +++---
 bindings/java/XMLString.java | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 06443b9..c9638ba 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -23,10 +23,10 @@ add_custom_command(
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Compiling java files and creating jar" VERBATIM
     COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/JNILibLoader.java	
-               ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd
-    COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr
+               ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/
+    COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr
     COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/XMLString.java	
-               ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr/XMLString.java
+               ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr/
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/make_jar.sh
 )
 
diff --git a/bindings/java/XMLString.java b/bindings/java/XMLString.java
index ad0c640..d215e1d 100644
--- a/bindings/java/XMLString.java
+++ b/bindings/java/XMLString.java
@@ -2,13 +2,12 @@ package org.ismrm.ismrmrd.xmlhdr;
 
 import javax.xml.bind.*;
 import java.io.StringReader;
+import java.io.StringWriter;
 
 
 public class XMLString {
     public static IsmrmrdHeader StringToIsmrmrdHeader(String xmlstring) throws javax.xml.bind.JAXBException
     {
-        ObjectFactory factory = new ObjectFactory();
-        //JAXBContext jc = JAXBContext.newInstance("org.ismrm.ismrmrd.xmlhdr", factory.getClass().getClassLoader());
         JAXBContext jc = JAXBContext.newInstance(IsmrmrdHeader.class);
         Unmarshaller u  = jc.createUnmarshaller();
         StringReader reader = new StringReader(xmlstring);
@@ -16,10 +15,14 @@ public class XMLString {
         return hdr;
     }
 
-    /*
-    public static String IsmrmrdHeaderToString(IsmrmrdHeader header)
+    public static String IsmrmrdHeaderToString(IsmrmrdHeader header) throws javax.xml.bind.JAXBException
     {
-
+        JAXBContext jc = JAXBContext.newInstance(IsmrmrdHeader.class);
+        Marshaller m = jc.createMarshaller();
+        m.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, "http://www.ismrm.org/ISMRMRD ismrmrd.xsd");
+        m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+        StringWriter writer = new StringWriter();
+        m.marshal(header, writer);
+        return writer.toString();
     }
-    */
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git