git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
dm
/
JabaOption.java
diff --git
a/src/jalview/ws/jws2/dm/JabaOption.java
b/src/jalview/ws/jws2/dm/JabaOption.java
index
55b2797
..
ef6969c
100644
(file)
--- a/
src/jalview/ws/jws2/dm/JabaOption.java
+++ b/
src/jalview/ws/jws2/dm/JabaOption.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,14
+20,14
@@
*/
package jalview.ws.jws2.dm;
*/
package jalview.ws.jws2.dm;
-import jalview.ws.jws2.ParameterUtils;
-import jalview.ws.params.OptionI;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import compbio.metadata.Option;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import compbio.metadata.Option;
+import jalview.util.MessageManager;
+import jalview.ws.jws2.ParameterUtils;
+import jalview.ws.params.OptionI;
public class JabaOption implements jalview.ws.params.OptionI
{
public class JabaOption implements jalview.ws.params.OptionI
{
@@
-53,13
+53,15
@@
public class JabaOption implements jalview.ws.params.OptionI
@Override
public URL getFurtherDetails()
{
@Override
public URL getFurtherDetails()
{
- try {
- return new URL(opt.getBasicURL().toExternalForm()+"/"+opt.getFurtherDetails());
- }
- catch (NullPointerException q) {}
- catch (MalformedURLException q)
+ try
{
{
-
+ return new URL(opt.getBasicURL().toExternalForm() + "/"
+ + opt.getFurtherDetails());
+ } catch (NullPointerException q)
+ {
+ } catch (MalformedURLException q)
+ {
+
}
return null;
}
}
return null;
}
@@
-91,9
+93,9
@@
public class JabaOption implements jalview.ws.params.OptionI
opt.setDefaultValue(selectedItem);
} catch (Exception e)
{
opt.setDefaultValue(selectedItem);
} catch (Exception e)
{
- e.printStackTrace();
- throw new Error(
- "Implementation error: cannot set Jaba Option to a value outside its allowed value range!");
+ throw new IllegalArgumentException(MessageManager
+ .formatMessage("error.invalid_value_for_option", new String[]
+ { selectedItem, opt.getName() }));
}
}
}
}
@@
-114,4
+116,10
@@
public class JabaOption implements jalview.ws.params.OptionI
return opt;
}
return opt;
}
+ @Override
+ public List<String> getDisplayNames()
+ {
+ return null; // not supported for Jaba options
+ }
+
}
}