[5/6] incubator-taverna-workbench git commit: Squashed commit of the following:

[stain]

Squashed commit of the following:

commit be502953eaad33fbb27bc26100f451a02829f7d2
Author: ThilinaManamgoda <maanafun...@gmail.com>
Date:   Thu Jun 30 17:12:56 2016 +0530

    TAVERNA-989

commit ed2ab6f13b428414ac7905a62fce14b4b7416b4a
Author: ThilinaManamgoda <maanafun...@gmail.com>
Date:   Thu Jun 30 04:03:29 2016 +0530

    rollback

commit 4c548c8fceebba32532f0e3e068e8ea8d8136dec
Author: ThilinaManamgoda <maanafun...@gmail.com>
Date:   Thu Jun 30 03:55:48 2016 +0530

    testing

TAVERNA-989 Fix

Contributed by ThilinaManamgoda

This closes #1


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/34b01efe
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/34b01efe
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/34b01efe

Branch: refs/heads/master
Commit: 34b01efeb17c2b4029788d3ee5679bcdbca815a1
Parents: 62f4b3d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 30 13:21:12 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 30 13:21:12 2016 +0100

----------------------------------------------------------------------
 .../servicedescriptions/impl/ServiceDescriptionRegistryImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/34b01efe/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
----------------------------------------------------------------------
diff --git 
a/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
 
b/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
index 96e7cf3..efe046d 100644
--- 
a/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
+++ 
b/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
@@ -129,7 +129,7 @@ public class ServiceDescriptionRegistryImpl implements 
ServiceDescriptionRegistr
        private File getTavernaStartupConfigurationDirectory() {
                File distroHome = null;
                File configDirectory = null;
-               distroHome = applicationConfiguration.getStartupDir();
+               distroHome = applicationConfiguration.getStartupDir().toFile();
                configDirectory = new File(distroHome, "conf");
                if (!configDirectory.exists())
                        configDirectory.mkdir();
@@ -185,7 +185,7 @@ public class ServiceDescriptionRegistryImpl implements 
ServiceDescriptionRegistr
 
        private File findServiceDescriptionsFile() {
                File confDir = new File(
-                               
applicationConfiguration.getApplicationHomeDir(), CONF_DIR);
+                               
applicationConfiguration.getApplicationHomeDir().toFile() , CONF_DIR);
                confDir.mkdirs();
                if (!confDir.isDirectory())
                        throw new RuntimeException("Invalid directory: " + 
confDir);