merge remote and fix conflicts

BIOP · Dec 20, 2024 · 6a26b17 · 6a26b17
2 parents 2ee7580 + a5a94b7
commit 6a26b17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/ch/epfl/biop/atlas/mouse/allen/ccfv3p1asr/AllenBrainCCFv3p1ASRDownloader.java b/src/main/java/ch/epfl/biop/atlas/mouse/allen/ccfv3p1asr/AllenBrainCCFv3p1ASRDownloader.java
@@ -64,7 +64,7 @@ static public URL getMapUrl() {
         URL returned = null;
 
         try {
-            if (dlXml) DownloadProgressBar.urlToFile(new URL(allen_mouse_brain_CCFv3p1asr_xml_v1), new File(AtlasLocationHelper.getAtlasCacheDir(), "mouse_brain_ccfv3p1.xml"), "Downloading mouse_brain_ccfv3p1.xml", -1);
+            if (dlXml) DownloadProgressBar.urlToFile(new URL(allen_mouse_brain_CCFv3p1asr_xml_v1), new File(AtlasLocationHelper.getAtlasCacheDir(), "mouse_brain_ccfv3p1asr.xml"), "Downloading mouse_brain_ccfv3p1asr.xml", -1);
             if (dlH5) DownloadProgressBar.urlToFile(new URL(AllenBrainCCFv3Downloader.allen_mouse_brain_CCFv3_hdf5_v1), new File(AtlasLocationHelper.getAtlasCacheDir(), "ccf2017-mod65000-border-centered-mm-bc.h5"), "Downloading mouse_brain_ccfv3.h5", 3_089_344_351L);
 
             returned = fileXml.toURI().toURL();

diff --git a/.../atlas/mouse/allen/ccfv3p1asr/command/AllenBrainAdultMouseAtlasCCF2017v3p1ASRCommand.java b/.../atlas/mouse/allen/ccfv3p1asr/command/AllenBrainAdultMouseAtlasCCF2017v3p1ASRCommand.java
@@ -46,8 +46,8 @@ public String toString() {
 
 	public static String keyPrefix = AllenBrainAdultMouseAtlasCCF2017v3p1ASRCommand.class.getName()+".";
 
-	String mapUrl = Prefs.get(keyPrefix+"mapUrl","");
-    String ontologyUrl = Prefs.get(keyPrefix+"ontologyUrl","");
+	String mapUrl;// = Prefs.get(keyPrefix+"mapUrl","");
+    String ontologyUrl;// = Prefs.get(keyPrefix+"ontologyUrl","");
 
 	@Parameter(type= ItemIO.OUTPUT)
 	Atlas ba;