From 9bec58fb482f4121e22220e5fb1405da7a8ee5e6 Mon Sep 17 00:00:00 2001
From: Petr Bainar <petr.bainar@hotmail.com>
Date: Mon, 29 Jan 2018 15:13:24 +0100
Subject: [PATCH] jobInfoRemoval: minor refactoring
---
.../src/main/java/cz/it4i/fiji/haas/Job.java | 6 +--
.../java/cz/it4i/fiji/haas/JobManager.java | 2 +-
.../core/BenchmarkJobManager.java | 45 ++++++++++---------
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
index ca518a47..fc57f3e1 100644
--- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
+++ b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
@@ -92,7 +92,7 @@ public class Job {
- synchronized public long getJobId() {
+ synchronized public long getId() {
if (jobId == null) {
jobId = getJobId(jobDir);
}
@@ -112,7 +112,7 @@ public class Job {
}
synchronized public void download(Predicate<String> predicate, Progress notifier) {
- haasClientSupplier.get().download(getJobId(), jobDir, predicate, new P_ProgressNotifierAdapter(notifier));
+ haasClientSupplier.get().download(getId(), jobDir, predicate, new P_ProgressNotifierAdapter(notifier));
}
public JobState getState() {
@@ -168,7 +168,7 @@ public class Job {
}
private void updateJobInfo() {
- jobInfo = haasClientSupplier.get().obtainJobInfo(getJobId());
+ jobInfo = haasClientSupplier.get().obtainJobInfo(getId());
}
private static boolean isValidPath(Path path) {
diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java
index dacae052..dfcf3549 100644
--- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java
+++ b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java
@@ -68,7 +68,7 @@ public class JobManager {
}
public void downloadJob(Long id, Progress notifier) {
- Iterator<Job> job = jobs.stream().filter(j -> j.getJobId() == id).iterator();
+ Iterator<Job> job = jobs.stream().filter(j -> j.getId() == id).iterator();
assert job.hasNext();
job.next().download(notifier);
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 731b4b43..081027d5 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
@@ -54,51 +54,51 @@ public class BenchmarkJobManager {
String outputName = getOutputName(job.openLocalFile(Constants.CONFIG_YAML));
job.submit();
job.setProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN, outputName);
+ fireValueChangedEvent();
setDownloaded(false);
}
public JobState getState() {
- job.updateInfo();
return oldState = job.getState();
}
public void downloadData(Progress progress) throws IOException {
- if (this.job.getState() == JobState.Finished) {
- String filePattern = this.job.getProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN);
- this.job.download(downloadFinishedData(filePattern), progress);
- } else if (this.job.getState() == JobState.Failed) {
- this.job.download(downloadFailedData(), progress);
+ if (job.getState() == JobState.Finished) {
+ String filePattern = job.getProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN);
+ job.download(downloadFinishedData(filePattern), progress);
+ } else if (job.getState() == JobState.Failed) {
+ job.download(downloadFailedData(), progress);
}
fireValueChangedEvent();
setDownloaded(true);
}
public void downloadStatistics(Progress progress) throws IOException {
- this.job.download(BenchmarkJobManager.downloadStatistics(), progress);
+ job.download(BenchmarkJobManager.downloadStatistics(), progress);
fireValueChangedEvent();
- Path resultFile = this.job.getDirectory().resolve(Constants.BENCHMARK_RESULT_FILE);
+ Path resultFile = job.getDirectory().resolve(Constants.BENCHMARK_RESULT_FILE);
if (resultFile != null)
BenchmarkJobManager.formatResultFile(resultFile);
}
public List<String> getOutput(List<JobSynchronizableFile> files) {
- return this.job.getOutput(files);
+ return job.getOutput(files);
}
public long getId() {
- return this.job.getJobId();
+ return job.getId();
}
public String getCreationTime() {
- return getStringFromTimeSafely(this.job.getCreationTime());
+ return getStringFromTimeSafely(job.getCreationTime());
}
public String getStartTime() {
- return getStringFromTimeSafely(this.job.getStartTime());
+ return getStringFromTimeSafely(job.getStartTime());
}
public String getEndTime() {
- return getStringFromTimeSafely(this.job.getEndTime());
+ return getStringFromTimeSafely(job.getEndTime());
}
private String getStringFromTimeSafely(Calendar time) {
@@ -112,7 +112,7 @@ public class BenchmarkJobManager {
@Override
public int hashCode() {
- return Long.hashCode(this.job.getJobId());
+ return Long.hashCode(job.getId());
}
@Override
@@ -125,31 +125,32 @@ public class BenchmarkJobManager {
}
public void update(BenchmarkJob benchmarkJob) {
- if (benchmarkJob.job.getState() != oldState) {
+ job = benchmarkJob.job;
+ if (benchmarkJob.job.getState() != oldState)
fireValueChangedEvent();
- }
}
-
+
public boolean downloaded() {
return getDownloaded();
}
public BenchmarkJob update() {
- this.job.updateInfo();
+ job.updateInfo();
+ if (!job.getState().equals(oldState))
+ fireValueChangedEvent();
return this;
}
public Path getDirectory() {
- return this.job.getDirectory();
+ return job.getDirectory();
}
-
private void setDownloaded(boolean b) {
- this.job.setProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY, b + "");
+ job.setProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY, b + "");
}
private boolean getDownloaded() {
- String downloadedStr = this.job.getProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY);
+ String downloadedStr = job.getProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY);
return downloadedStr != null && Boolean.parseBoolean(downloadedStr);
}
}
--
GitLab