Use Path instead of 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/8e41379f Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/8e41379f Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/8e41379f
Branch: refs/heads/master Commit: 8e41379ff5d10bef70f770b10255d2fb605d2e0c Parents: 0bba476 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Oct 24 11:09:55 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Oct 24 11:09:55 2016 +0100 ---------------------------------------------------------------------- .../taverna/workbench/run/actions/OpenWorkflowRunAction.java | 7 ++++--- .../taverna/workbench/run/menu/FileOpenRunMenuAction.java | 8 +++----- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8e41379f/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java ---------------------------------------------------------------------- diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java index 583a463..89fd932 100644 --- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java +++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java @@ -25,6 +25,7 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; +import java.nio.file.Path; import javax.swing.AbstractAction; import javax.swing.JFileChooser; @@ -48,9 +49,9 @@ public class OpenWorkflowRunAction extends AbstractAction { private static final String OPEN_WORKFLOW_RUN = "Open workflow run..."; private final RunService runService; - private final File runStore; + private final Path runStore; - public OpenWorkflowRunAction(RunService runService, File runStore) { + public OpenWorkflowRunAction(RunService runService, Path runStore) { super(OPEN_WORKFLOW_RUN, WorkbenchIcons.openIcon); this.runService = runService; this.runStore = runStore; @@ -82,7 +83,7 @@ public class OpenWorkflowRunAction extends AbstractAction { } }); - fileChooser.setCurrentDirectory(runStore); + fileChooser.setCurrentDirectory(runStore.toFile()); fileChooser.setMultiSelectionEnabled(true); if (fileChooser.showOpenDialog(parentComponent) == APPROVE_OPTION) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8e41379f/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java ---------------------------------------------------------------------- diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java index 74ba35f..fde31bf 100644 --- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java +++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java @@ -18,12 +18,12 @@ package org.apache.taverna.workbench.run.menu; import static org.apache.taverna.workbench.run.menu.FileRunMenuSection.FILE_RUN_SECTION_URI; -import java.io.File; import java.net.URI; +import java.nio.file.Path; import javax.swing.Action; -import org.apache.taverna.configuration.app.ApplicationConfiguration; +import org.apache.taverna.configuration.app.ApplicationConfiguration; import org.apache.taverna.platform.run.api.RunService; import org.apache.taverna.ui.menu.AbstractMenuAction; import org.apache.taverna.workbench.run.actions.OpenWorkflowRunAction; @@ -42,9 +42,7 @@ public class FileOpenRunMenuAction extends AbstractMenuAction { @Override protected Action createAction() { - File runStore = new File( - applicationConfiguration.getApplicationHomeDir(), - RUN_STORE_DIRECTORY); + Path runStore = applicationConfiguration.getApplicationHomeDir().resolve(RUN_STORE_DIRECTORY); return new OpenWorkflowRunAction(runService, runStore); }
