Skip to content
Snippets Groups Projects
Commit 614a0215 authored by Petr Bainar's avatar Petr Bainar
Browse files

iss1011: minor and super-gentle refactoring

parent 208d279d
No related branches found
No related tags found
1 merge request!5Iss1011
package cz.it4i.fiji.haas_java_client;
public enum JobState {
Configuring ,
Submitted ,
Queued ,
Running ,
Finished ,
Failed ,
Unknown,
Configuring,
Submitted,
Queued,
Running,
Finished,
Failed,
Canceled;
}
......@@ -4,33 +4,23 @@ import java.util.Collection;
import java.util.LinkedList;
public class Task {
private SPIMComputationAccessor outputHolder;
private String description;
private Collection<TaskComputation> computations;
private int numComputations;
private final String description;
private final Collection<TaskComputation> computations;
public Task(SPIMComputationAccessor outputHolder, String description, int numComputations) {
this.description = description;
this.outputHolder = outputHolder;
this.numComputations = numComputations;
}
public Collection<TaskComputation> getComputations() {
if (computations == null) {
fillComputations();
this.computations = new LinkedList<>();
for (int i = 0; i < numComputations; i++) {
computations.add(new TaskComputation(outputHolder, this, i + 1));
}
return computations;
}
public String getDescription() {
return description;
}
private void fillComputations() {
computations = new LinkedList<>();
for (int i = 0; i < numComputations; i++) {
computations.add(new TaskComputation(outputHolder, this, i + 1));
}
public Collection<TaskComputation> getComputations() {
return computations;
}
}
......@@ -5,29 +5,29 @@ import java.util.LinkedList;
import cz.it4i.fiji.haas_java_client.JobState;
public class TaskComputation {
private SPIMComputationAccessor outputHolder;
private int timepoint;
private final SPIMComputationAccessor outputHolder;
private final Task task;
private final int timepoint;
private Long id;
//TASK 1011 what states will be defined and how it will be defined
private JobState state;
private Task task;
private JobState state = JobState.Unknown;
private Collection<String> logs = new LinkedList<>();
private Collection<String> outputs = new LinkedList<>();
private Collection<String> inputs = new LinkedList<>();
public TaskComputation(SPIMComputationAccessor outputHolder,Task task, int timepoint) {
public TaskComputation(SPIMComputationAccessor outputHolder, Task task, int timepoint) {
this.outputHolder = outputHolder;
this.timepoint = timepoint;
this.task = task;
this.timepoint = timepoint;
}
public JobState getState() {
updateState();//TASK 1011 it is not good idea update every time when state is requested
return state != null?state:JobState.Configuring;
return state;
}
private void updateState() {
......@@ -42,7 +42,7 @@ public class TaskComputation {
}
private Long getId() {
if(id == null) {
if (id == null) {
fillId();
}
return id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment