You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/10/24 10:10:19 UTC

[6/7] incubator-taverna-workbench git commit: Use Path, not File

Use Path, not File

Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/0bba476d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/0bba476d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/0bba476d

Branch: refs/heads/master
Commit: 0bba476d2868101e0a90014be41797a7c8b5cc96
Parents: 1aabbf1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:08:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:08:39 2016 +0100

----------------------------------------------------------------------
 .../run/cleanup/WorkflowRunStatusShutdownHook.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/0bba476d/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
index 2126b5f..b01fe15 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
@@ -16,17 +16,18 @@
  */
 package org.apache.taverna.workbench.run.cleanup;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.taverna.configuration.app.ApplicationConfiguration;
 
-import org.apache.taverna.workbench.ShutdownSPI;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
 import org.apache.taverna.platform.execution.api.InvalidExecutionIdException;
 import org.apache.taverna.platform.run.api.InvalidRunIdException;
 import org.apache.taverna.platform.run.api.RunService;
 import org.apache.taverna.platform.run.api.RunStateException;
+import org.apache.taverna.workbench.ShutdownSPI;
 
 /**
  * Shutdown hook that detects running and paused workflows.
@@ -81,14 +82,14 @@ public class WorkflowRunStatusShutdownHook implements ShutdownSPI {
 						| InvalidExecutionIdException e) {
 				}
 			for (String workflowRun : workflowRuns) {
-				File runStore = new File(
-						applicationConfiguration.getApplicationHomeDir(),
+				Path runStore = applicationConfiguration.getApplicationHomeDir().resolve(
 						RUN_STORE_DIRECTORY);
 				try {
-					File file = new File(runStore,
+					Path runFile = runStore.resolve(
 							runService.getRunName(workflowRun) + ".wfRun");
-					if (!file.exists())
-						runService.save(workflowRun, file);
+					if (Files.notExists(runFile)) {
+						runService.save(workflowRun, runFile);
+					}
 				} catch (InvalidRunIdException | IOException e) {
 				}
 			}