Merge branch 'features/mchmmer' into merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950
authorJim Procter <jprocter@issues.jalview.org>
Mon, 23 Jul 2018 07:56:57 +0000 (08:56 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 23 Jul 2018 07:56:57 +0000 (08:56 +0100)
commit7692386ccfe778075dd83a753d30a7a27fe507be
tree843d330d934a6efc79714e0c73cdb8cecf6547da
parent97264690f394f98cf13cd1d834a53e8956fb1b0e
parente0fd9965a1ffacf4ac034a79e7cb5f7e898ff69f
Merge branch 'features/mchmmer' into merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950
merging refactored wsui with mchmmer to get latest service parameters goodness.
13 files changed:
help/help.jhm
help/helpTOC.xml
help/html/features/preferences.html
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Preferences.java
src/jalview/gui/WsJobParameters.java
src/jalview/jbgui/GPreferences.java
src/jalview/ws/jws2/Jws2Client.java
test/jalview/ws/gui/Jws2ParamView.java
test/jalview/ws/jabaws/DisorderAnnotExportImport.java
test/jalview/ws/jabaws/RNAStructExportImport.java
test/jalview/ws/jws2/ParameterUtilsTest.java