Merge branch 'JAL-3878_web_services_overhaul' into try-to-update-slivka-jar
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 29 Nov 2022 15:34:41 +0000 (15:34 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 29 Nov 2022 15:34:41 +0000 (15:34 +0000)
commit8aa8957ae59e9171681ed89c8947dcfba847c1e4
treea1b89002da9e60016febaf56f684ab662ecf1a91
parent8764cf9e079a8c7d72d920403ce4db71450183f1
parent9a5c8af21bd813e0c62ffcd7e4c0c3e2c33b9947
Merge branch 'JAL-3878_web_services_overhaul' into try-to-update-slivka-jar
JAL-3066 JAL-3362 Update 2.12 alpha with latest slivka-client.jar
 Conflicts:
src/jalview/bin/Cache.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/workers/AlignCalcManager.java
src/jalview/ws/jws2/JPredThread.java
src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java
src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
src/jalview/ws/slivkaws/SlivkaWSInstance.java
swingjs/ver/3.3.1/SwingJS-site.zip
swingjs/ver/3.3.1/timestamp
27 files changed:
src/jalview/bin/Cache.java
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/Desktop.java
src/jalview/gui/Preferences.java
src/jalview/gui/SlivkaPreferences.java
src/jalview/io/AnnotationFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/jbgui/GPreferences.java
src/jalview/schemes/AnnotationColourGradient.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/AlignCalcManager2.java
src/jalview/ws/gui/MsaWSThread.java
src/jalview/ws/jws2/SeqAnnotationServiceCalcWorker.java
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java
src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
src/jalview/ws2/PollingTaskExecutor.java
src/jalview/ws2/operations/AlignmentOperation.java
src/jalview/ws2/operations/AnnotationServiceWorker.java
src/jalview/ws2/slivka/SlivkaWSDiscoverer.java
src/jalview/ws2/slivka/SlivkaWebService.java
test/jalview/gui/AlignViewportTest.java
test/jalview/ws/jabaws/DisorderAnnotExportImport.java