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/02/14 23:55:51 UTC

incubator-taverna-common-activities git commit: file->path (using toFile)

Repository: incubator-taverna-common-activities
Updated Branches:
  refs/heads/master 9f29c1929 -> 1a932ae3f


file->path (using toFile)


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/1a932ae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/1a932ae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/1a932ae3

Branch: refs/heads/master
Commit: 1a932ae3f6e05703f211775da761a10155bc5a3a
Parents: 9f29c19
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Feb 14 22:53:40 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Feb 14 22:55:33 2016 +0000

----------------------------------------------------------------------
 .../externaltool/manager/impl/InvocationGroupManagerImpl.java      | 2 +-
 .../apache/taverna/activities/interaction/InteractionUtils.java    | 2 +-
 .../activities/interaction/preference/InteractionPreference.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1a932ae3/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
index 31cda2b..5873545 100644
--- a/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
+++ b/taverna-external-tool-activity/src/main/java/org/apache/taverna/activities/externaltool/manager/impl/InvocationGroupManagerImpl.java
@@ -319,7 +319,7 @@ public class InvocationGroupManagerImpl implements Observable<InvocationManagerE
 	@Override
 	public File getInvocationManagerDirectory() {
 
-		File home = applicationConfiguration.getApplicationHomeDir();
+		File home = applicationConfiguration.getApplicationHomeDir().toFile();
 
 		File invocationManagerDirectory = new File(home,"externaltool");
 		if (!invocationManagerDirectory.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1a932ae3/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java
index 24df89d..22e31f9 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/InteractionUtils.java
@@ -114,7 +114,7 @@ public class InteractionUtils {
 
 	public File getInteractionServiceDirectory() {
 		final File workingDir = appConfig
-				.getApplicationHomeDir();
+				.getApplicationHomeDir().toFile();
 		final File interactionServiceDirectory = new File(workingDir,
 				"interactionService");
 		interactionServiceDirectory.mkdirs();

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/1a932ae3/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java
index e904a47..3e9f58c 100644
--- a/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java
+++ b/taverna-interaction-activity/src/main/java/org/apache/taverna/activities/interaction/preference/InteractionPreference.java
@@ -75,7 +75,7 @@ public class InteractionPreference {
 
 	private File getConfigFile() {
 		final File home = appConfig
-				.getApplicationHomeDir();
+				.getApplicationHomeDir().toFile();
 		final File config = new File(home, "conf");
 		if (!config.exists()) {
 			config.mkdir();