iss1007: support for cancle

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java

@@ -247,6 +247,10 @@ public class Job {
 		return haasClientSupplier.get().getChangedFiles(getId());
 	}
 
+	public void cancelJob() {
+		haasClientSupplier.get().cancelJob(jobId);
+	}
+
 	
 
 	

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java

@@ -314,6 +314,14 @@ public class HaaSClient {
 	}
 	
 	
+	public void cancelJob(Long jobId) {
+		try {
+			getJobManagement().cancelJob(jobId, getSessionID());
+		} catch (RemoteException | ServiceException e) {
+			throw new HaaSClientException(e);
+		}
+	}
+
 	private void doSubmitJob(long jobId) throws RemoteException, ServiceException {
 		getJobManagement().submitJob(jobId, getSessionID());
 	}

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java

@@ -100,7 +100,7 @@ public class BenchmarkJobManager {
 			if (job.getState() == JobState.Finished) {
 				String filePattern = job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN);
 				job.download(downloadFinishedData(filePattern), progress);
-			} else if (job.getState() == JobState.Failed) {
+			} else if (job.getState() == JobState.Failed ||  job.getState() == JobState.Canceled) {
 				job.download(downloadFailedData(), progress);
 			}
 			
@@ -214,6 +214,10 @@ public class BenchmarkJobManager {
 		public boolean remove() {
 			return job.remove();
 		}
+
+		public void cancelJob() {
+			job.cancelJob();
+		}
 		
 	}
 
@@ -289,9 +293,8 @@ public class BenchmarkJobManager {
 			Path path = getPathSafely(name);
 			if (path == null)
 				return false;
-			
 			return path.getFileName().toString().startsWith("snakejob.")
-					|| path.getParent().getFileName().toString().equals("logs");
+					|| path.getParent() != null && path.getParent().getFileName() != null && path.getParent().getFileName().toString().equals("logs");
 		};
 	}
 	

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java

@@ -102,6 +102,11 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 			registry.get(job.getValue()).update();
 		}), job -> notNullValue(job, j -> j.getState() == JobState.Configuring || j.getState() == JobState.Finished));
 
+		menu.addItem("Cancel job", job -> executeWSCallAsync("Canceling job", p -> {
+			job.getValue().cancelJob();
+			registry.get(job.getValue()).update();
+		}), job -> notNullValue(job, j -> j.getState() == JobState.Running));
+
 		menu.addItem("Show progress", job -> {
 			try {
 				new SPIMPipelineProgressViewWindow(root, job.getValue()).setVisible(true);
@@ -115,7 +120,8 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 		menu.addItem("Download result",
 				job -> executeWSCallAsync("Downloading data", p -> job.getValue().downloadData(p)),
 				job -> notNullValue(job,
-						j -> EnumSet.of(JobState.Failed, JobState.Finished).contains(j.getState()) && !j.downloaded()));
+						j -> EnumSet.of(JobState.Failed, JobState.Finished, JobState.Canceled).contains(j.getState())
+								&& !j.downloaded()));
 		menu.addItem("Download statistics",
 				job -> executeWSCallAsync("Downloading data", p -> job.getValue().downloadStatistics(p)),
 				job -> notNullValue(job, j -> j.getState() == JobState.Finished));
@@ -148,8 +154,11 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 		FXFrame.Controller.executeAsync(executorServiceWS, (Callable<Void>) () -> {
 			ProgressDialog dialog = ModalDialogs.doModal(new ProgressDialog(root, title),
 					WindowConstants.DO_NOTHING_ON_CLOSE);
-			action.doAction(dialog);
-			dialog.done();
+			try {
+				action.doAction(dialog);
+			} finally {
+				dialog.done();
+			}
 			return null;
 		}, x -> {
 			if (update)