Add XmlIoAbstractSequenceDescription.toXML with basePathURI

bigdataviewer · Sep 14, 2024 · ab19266 · ab19266
1 parent c9fbc6a
commit ab19266
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/mpicbg/spim/data/SpimDataExample2.java b/src/main/java/mpicbg/spim/data/SpimDataExample2.java
@@ -173,11 +173,11 @@ public static void exampleSequenceDescription() throws IOException, ParseExcepti
 	{
 		final XmlIoSequenceDescription io = new XmlIoSequenceDescription();
 		final SequenceDescription sequence = createSequenceDescription();
-		final Document doc = new Document( io.toXml( sequence, null ) );
+		final Document doc = new Document( io.toXml( sequence, ( URI ) null ) );
 		new XMLOutputter( Format.getPrettyFormat() ).output( doc, System.out );
 
 		final SequenceDescription fromXml = io.fromXml( doc.getRootElement(), ( URI ) null );
-		new XMLOutputter( Format.getPrettyFormat() ).output( new Document( new XmlIoSequenceDescription().toXml( fromXml, null ) ), System.out );
+		new XMLOutputter( Format.getPrettyFormat() ).output( new Document( new XmlIoSequenceDescription().toXml( fromXml, ( URI ) null ) ), System.out );
 	}
 
 	public static void exampleViewRegistrations() throws SpimDataException, IOException

diff --git a/src/main/java/mpicbg/spim/data/generic/XmlIoAbstractSpimData.java b/src/main/java/mpicbg/spim/data/generic/XmlIoAbstractSpimData.java
@@ -222,7 +222,7 @@ public Element toXml( final T spimData, final URI xmlParentURI ) throws SpimData
 		final Element root = super.toXml();
 		root.setAttribute( SPIMDATA_VERSION_ATTRIBUTE_NAME, SPIMDATA_VERSION_ATTRIBUTE_CURRENT );
 		root.addContent( XmlHelpers.pathElementURI( "BasePath", spimData.getBasePathURI(), xmlParentURI ) );
-		root.addContent( xmlIoSequenceDescription.toXml( spimData.getSequenceDescription(), spimData.getBasePath() ) );
+		root.addContent( xmlIoSequenceDescription.toXml( spimData.getSequenceDescription(), spimData.getBasePathURI() ) );
 		root.addContent( xmlIoViewRegistrations.toXml( spimData.getViewRegistrations() ) );
 		return root;
 	}

diff --git a/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoAbstractSequenceDescription.java b/src/main/java/mpicbg/spim/data/generic/sequence/XmlIoAbstractSequenceDescription.java
@@ -69,14 +69,19 @@ public XmlIoAbstractSequenceDescription( final Class< T > klass,
 	}
 
 	public Element toXml( final T sequenceDescription, final File basePath ) throws SpimDataException
+	{
+		return toXml( sequenceDescription, basePath.toURI() );
+	}
+
+	public Element toXml( final T sequenceDescription, final URI basePathURI ) throws SpimDataException
 	{
 		final Element elem = super.toXml();
 
 		final BasicImgLoader imgLoader = sequenceDescription.getImgLoader();
 		if ( imgLoader != null )
 		{
 			final XmlIoBasicImgLoader< ? > imgLoaderIo = ImgLoaders.createXmlIoForImgLoaderClass( imgLoader.getClass() );
-			elem.addContent( createImgLoaderElement( imgLoaderIo, imgLoader, basePath ) );
+			elem.addContent( createImgLoaderElement( imgLoaderIo, imgLoader, basePathURI ) );
 		}
 
 		elem.addContent( xmlIoViewSetups.toXml( sequenceDescription.getViewSetups() ) );
@@ -128,9 +133,9 @@ public T fromXml( final Element elem, final URI basePathURI ) throws SpimDataExc
 	 * Casting madness.
 	 */
 	@SuppressWarnings( "unchecked" )
-	private static < L extends BasicImgLoader > Element createImgLoaderElement( final XmlIoBasicImgLoader< L > imgLoaderIo, final BasicImgLoader imgLoader, final File basePath )
+	private static < L extends BasicImgLoader > Element createImgLoaderElement( final XmlIoBasicImgLoader< L > imgLoaderIo, final BasicImgLoader imgLoader, final URI basePathURI )
 	{
-		return imgLoaderIo.toXml( ( L ) imgLoader, basePath );
+		return imgLoaderIo.toXml( ( L ) imgLoader, basePathURI );
 	}
 
 	/**