Repository: incubator-taverna-workbench Updated Branches: refs/heads/master 393b3224e -> ea1681ef3
testing 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/4c548c8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/4c548c8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/4c548c8f Branch: refs/heads/master Commit: 4c548c8fceebba32532f0e3e068e8ea8d8136dec Parents: 0e86f72 Author: ThilinaManamgoda <[email protected]> Authored: Thu Jun 30 03:55:48 2016 +0530 Committer: ThilinaManamgoda <[email protected]> Committed: Thu Jun 30 03:55:48 2016 +0530 ---------------------------------------------------------------------- .../impl/ServiceDescriptionRegistryImpl.java | 4 ++-- .../ui/activitypalette/ActivityPaletteConfigurationTest.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c548c8f/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..b588976 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); http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c548c8f/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java ---------------------------------------------------------------------- diff --git a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java index 8f8269e..1021e4f 100644 --- a/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java +++ b/taverna-activity-palette-impl/src/test/java/org/apache/taverna/workbench/ui/activitypalette/ActivityPaletteConfigurationTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -46,8 +47,8 @@ public class ActivityPaletteConfigurationTest { d.mkdir(); manager = new ConfigurationManagerImpl(new ApplicationConfigurationImpl() { @Override - public File getApplicationHomeDir() { - return d; + public Path getApplicationHomeDir() { + return d.toPath(); } }); conf=new ActivityPaletteConfiguration(manager);
