diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java index 21d82ca287458a6132ba32ae45c06c19c52d4701..500dfdd40e0ef878379283fc6c3073e29bbd0fec 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java @@ -285,8 +285,8 @@ public class BenchmarkJobManager implements Closeable { return job.getOutputDirectory(); } - public Path getResultXML() { - return Paths.get(job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml"); + public String getResultXML() { + return job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN) + ".xml"; } public List<FileTransferInfo> getFileTransferInfo() { diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java index ccaf19944bba4cfff02719e3b2981bb2dd9256bc..429f2eb5e902cc22a5fc3bf9684a9db624435d02 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java @@ -9,7 +9,6 @@ import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.EnumSet; @@ -384,7 +383,7 @@ public class BenchmarkSPIMControl extends BorderPane implements } private void openBigDataViewer(BenchmarkJob job) { - Path resultXML = job.getResultXML(); + String resultXML = job.getResultXML(); Path localPathToResultXML = job.getOutputDirectory().resolve(resultXML); String openFile; if (Files.exists(localPathToResultXML)) { @@ -402,13 +401,13 @@ public class BenchmarkSPIMControl extends BorderPane implements } } - private String getPathToBDSForData(BenchmarkJob job, Path resultXML) { - Path changed = Paths.get(""+job.getId() ).resolve(resultXML); + private String getPathToBDSForData(BenchmarkJob job, String resultXML) { + String changed = job.getId() + "/" + resultXML; MessageDigest digest; try { digest = MessageDigest.getInstance("SHA-1"); digest.reset(); - digest.update(changed.toString().getBytes("utf8")); + digest.update(changed.getBytes("utf8")); String sha1 = String.format("%040x", new BigInteger(1, digest.digest())); String result = Constants.BDS_ADDRESS + sha1 + "/"; if (log.isDebugEnabled()) {