/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
import jalview.ws.params.ArgumentI;
import jalview.ws.params.OptionI;
import jalview.ws.params.ParamDatastoreI;
// System.out.println("Setting option "
// + System.identityHashCode(arg) + ":" + arg.getName()
// + " with " + arg.getDefaultValue());
- opanp.selectOption((OptionI) arg, arg.getDefaultValue());
+ opanp.selectOption((OptionI) arg, arg.getValue());
}
}
e.printStackTrace();
return;
}
- Jws2Discoverer.Jws2Instance lastserv = null;
- for (Jws2Discoverer.Jws2Instance service : disc.getServices())
+ Jws2Instance lastserv = null;
+ for (Jws2Instance service : disc.getServices())
{
lastserv = service;
if (p >= args.length || service.serviceType.equalsIgnoreCase(args[p]))
public List<ArgumentI> getJobParams()
{
- List<ArgumentI> argSet = new ArrayList<ArgumentI>();
- // recover options and parameters from GUI
- for (OptionBox opts : opanp.getOptSet().values())
- {
- OptionI opt = opts.getOptionIfEnabled();
- if (opt != null)
- {
- argSet.add(opt);
- }
- }
- for (ParamBox parambox : opanp.getParamSet().values())
- {
- ParameterI parm = parambox.getParameter();
- if (parm != null)
- {
- argSet.add(parm);
- }
- }
-
- return argSet;
+ return opanp.getCurrentSettings();
}
String lastParmSet = null;