From 208d279d49c83768282b946b2b0ea797a540bf16 Mon Sep 17 00:00:00 2001
From: Petr Bainar <petr.bainar@hotmail.com>
Date: Tue, 30 Jan 2018 13:49:08 +0100
Subject: [PATCH] iss1011: implementing fileExists method
---
.../haas_spim_benchmark/core/BenchmarkJobManager.java | 10 +++++-----
.../core/SPIMComputationAccessor.java | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
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 8e706e96..e0480df0 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 0ba65901..39151ca4 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);
}
--
GitLab