From e079a1be96263ca813cc323927afa114cd2cde5b Mon Sep 17 00:00:00 2001
From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Thu, 19 Sep 2013 14:44:57 +0100
Subject: [PATCH] JWS-17 re-design behaviour of Option.toString

---
 datamodel/compbio/metadata/Option.java            |    4 ++++
 webservices/compbio/ws/client/MetadataHelper.java |   26 ++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/datamodel/compbio/metadata/Option.java b/datamodel/compbio/metadata/Option.java
index 93361dd..7d9e9e4 100644
--- a/datamodel/compbio/metadata/Option.java
+++ b/datamodel/compbio/metadata/Option.java
@@ -208,7 +208,11 @@ public class Option<T> implements Argument<T> {
 			value += "Default value: " + this.defaultValue + SysPrefs.newlinechar;
 		}
 		if (null != this.furtherDetails) {
+			if (null != this.basicURL) {
 			value += "URL: " + this.basicURL + this.furtherDetails + SysPrefs.newlinechar;
+		}else {
+			value += "Relative URL: " + this.furtherDetails + SysPrefs.newlinechar;
+		}
 		} else {
 			value += "URL: unknown URL" + SysPrefs.newlinechar;
 		}
diff --git a/webservices/compbio/ws/client/MetadataHelper.java b/webservices/compbio/ws/client/MetadataHelper.java
index d5d8b06..20a9f76 100644
--- a/webservices/compbio/ws/client/MetadataHelper.java
+++ b/webservices/compbio/ws/client/MetadataHelper.java
@@ -44,7 +44,26 @@ public class MetadataHelper {
 	 * @param msaws
 	 *            web service proxy
 	 * @return List of options supported by a web service
-	 * @throws MalformedURLException 
+	 */
+	static <T> List<Option<T>> getParametersList(Metadata<T> msaws) {
+		assert msaws != null;
+		RunnerConfig<T> config = msaws.getRunnerOptions();
+		if (config == null) {
+			return Collections.emptyList();
+		}
+		return config.getArguments();
+	}
+
+	/**
+	 * Returns a list of options supported by web service
+	 * 
+	 * @param <T>
+	 *            web service type
+	 * @param msaws
+	 *            web service proxy
+	 * @param host
+	 *            the server URL, as a string
+	 * @return List of options supported by a web service
 	 */
 	static <T> List<Option<T>> getParametersList(Metadata<T> msaws, String host) throws MalformedURLException {
 		assert msaws != null;
@@ -59,11 +78,6 @@ public class MetadataHelper {
 		return opts;
 	}
 
-	static <T> List<Option<T>> getParametersList(Metadata<T> msaws) throws MalformedURLException {
-		return getParametersList (msaws, "http://unknown.jabaws.server.ac.uk");
-	}
-	
-	
 	/**
 	 * Returns an objects from which the list of presets supported by web
 	 * service <T> can be obtained
-- 
1.7.10.2