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 8e706e9603560b9b8a963aa1e983d9590736c286..e0480df0a77b883760209b3065c3c9925c46733d 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 @@ -1,6 +1,7 @@ package cz.it4i.fiji.haas_spim_benchmark.core; import java.io.BufferedReader; +import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; @@ -67,9 +68,9 @@ public class BenchmarkJobManager { } @Override - public boolean fileExists(String fileName) { - // TASK 1011 modify interface of job for checking of file existence - return false; + public boolean fileExists(Path filePath) { + File f = new File(filePath.toString()); + return f.exists() && !f.isDirectory(); } }; @@ -147,8 +148,7 @@ public class BenchmarkJobManager { @Override public boolean equals(Object obj) { if (obj instanceof BenchmarkJob) { - BenchmarkJob job = (BenchmarkJob) obj; - return job.getId() == getId(); + return ((BenchmarkJob) obj).getId() == getId(); } return false; } diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/SPIMComputationAccessor.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/SPIMComputationAccessor.java index 0ba6590109e4406f0d99e247ac8757d25af4e908..39151ca434b506f873741dae844360934863ffbb 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/SPIMComputationAccessor.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/SPIMComputationAccessor.java @@ -1,7 +1,9 @@ package cz.it4i.fiji.haas_spim_benchmark.core; +import java.nio.file.Path; + import cz.it4i.fiji.haas.HaaSOutputHolder; public interface SPIMComputationAccessor extends HaaSOutputHolder { - boolean fileExists(String fileName); + boolean fileExists(Path fileName); }