Mateusz Warowny [Wed, 9 Oct 2019 15:03:03 +0000 (16:03 +0100)]
JAL-3066 Fix log files retrieval.
Mateusz Warowny [Mon, 7 Oct 2019 15:14:58 +0000 (16:14 +0100)]
Jal-3066 Retrieve job log and error log from the server.
Jim Procter [Mon, 7 Oct 2019 07:58:20 +0000 (08:58 +0100)]
Revert "JAL-3070 JAL-3066 fix initialisation of slivka ServiceWithParameters"
This reverts commit
daa1765ab2101480a724b92a3f3e7dee662ba943.
Mateusz Warowny [Mon, 7 Oct 2019 11:13:59 +0000 (12:13 +0100)]
JAL-3066 AACon: pass the instance name of the service to the alignment analysis UI
Mateusz Warowny [Mon, 7 Oct 2019 10:23:24 +0000 (11:23 +0100)]
JAL-3066 Check if annotation and features are present before fetching
Mateusz Warowny [Mon, 7 Oct 2019 09:59:19 +0000 (10:59 +0100)]
Merge remote-tracking branch 'origin/tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration
Jim Procter [Mon, 7 Oct 2019 08:08:44 +0000 (09:08 +0100)]
JAL-3066 report job ID when submitted
Jim Procter [Mon, 7 Oct 2019 08:08:10 +0000 (09:08 +0100)]
JAL-3066 debug info: check response when adding features and annotation
Jim Procter [Mon, 7 Oct 2019 08:07:11 +0000 (09:07 +0100)]
JAL-3066 JAL-3070 AACon: pass the name of the service to the alignment analysis UI
Jim Procter [Mon, 7 Oct 2019 08:06:16 +0000 (09:06 +0100)]
JAL-3066 hack to instantiate the correct client according to slivka service annotation. NEEDS ROBUST TESTING!
Jim Procter [Mon, 7 Oct 2019 08:03:56 +0000 (09:03 +0100)]
JAL-3070 jaba/slivka independent tests for disorder and AACon services
Jim Procter [Mon, 7 Oct 2019 08:02:11 +0000 (09:02 +0100)]
JAL-3070 JAL-3066 provide standard concrete instances for instantaneous analysis UI settings container
Jim Procter [Mon, 7 Oct 2019 07:58:20 +0000 (08:58 +0100)]
JAL-3070 JAL-3066 fix initialisation of slivka ServiceWithParameters
Jim Procter [Mon, 7 Oct 2019 07:56:36 +0000 (08:56 +0100)]
JAL-3070 use identity equivalence for workers rather than relying on equals not being overridden to detect their presence.
Jim Procter [Mon, 7 Oct 2019 07:55:39 +0000 (08:55 +0100)]
JAL-3070 formatting
Mateusz Warowny [Fri, 4 Oct 2019 15:04:07 +0000 (16:04 +0100)]
Merge remote-tracking branch 'origin/tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration
Jim Procter [Thu, 3 Oct 2019 17:02:50 +0000 (18:02 +0100)]
JAL-3070 reinstate the internal test service URL for Slivka-bio
Jim Procter [Thu, 3 Oct 2019 16:53:46 +0000 (17:53 +0100)]
JAL-3070 test jabaws and slivka AACon service functionality
Jim Procter [Thu, 3 Oct 2019 16:29:53 +0000 (17:29 +0100)]
JAL-3070 slivka service discovery as a background thread - still need to unify Jabaws & slivka discoverer patterns
Jim Procter [Thu, 3 Oct 2019 15:25:58 +0000 (16:25 +0100)]
JAL-3070 basic AACon service functionality test
Jim Procter [Thu, 3 Oct 2019 15:21:08 +0000 (16:21 +0100)]
JAL-3070 alignment analysis service worker UI and settings management refactored from Jws2/JABAWS specific classes
Jim Procter [Thu, 3 Oct 2019 15:18:39 +0000 (16:18 +0100)]
JAL-3070 call checkDone() ASAP to avoid race condition for threads watching state of the calculation manager (e.g. in tests)
Jim Procter [Wed, 2 Oct 2019 16:52:06 +0000 (17:52 +0100)]
JAL-3070 decouple WsMenuEntryProviderI code from JABAWS
Jim Procter [Wed, 2 Oct 2019 16:44:36 +0000 (17:44 +0100)]
JAL-3070 reorganise prior to refactor
Jim Procter [Wed, 2 Oct 2019 16:29:26 +0000 (17:29 +0100)]
JAL-3070 make AlignCalcUI service code work only with instances of ServiceWithParameters
Jim Procter [Wed, 2 Oct 2019 16:07:53 +0000 (17:07 +0100)]
JAL-3070 discoverers return ServiceWithParameter, now containing logic and call code for MsaWSClient or SequenceAnnotationWSClient.attachWSMenuEntry
Jim Procter [Wed, 2 Oct 2019 15:25:08 +0000 (16:25 +0100)]
JAL-3070 decontaminate the ‘preferred service’ methods for instantaneous alignment analysis service GUI
Jim Procter [Wed, 2 Oct 2019 14:19:41 +0000 (15:19 +0100)]
JAL-3070 JAL-3062 tidy up slivka ws menu builder and add in AACons style service UI
Jim Procter [Wed, 2 Oct 2019 14:15:25 +0000 (15:15 +0100)]
JAL-3070 detect failed/broken annotation web service jobs using generic JWS2 job state flag processing logic
Jim Procter [Wed, 2 Oct 2019 14:14:38 +0000 (15:14 +0100)]
JAL-3070 pull up generic methods for an automatic alignment analysis web service calculation
Jim Procter [Wed, 2 Oct 2019 14:12:26 +0000 (15:12 +0100)]
JAL-3070 TODO
Mateusz Warowny [Tue, 1 Oct 2019 16:30:08 +0000 (17:30 +0100)]
JAL-3066 Sequence annotation services.
Mateusz Warowny [Fri, 27 Sep 2019 15:58:56 +0000 (16:58 +0100)]
JAL-3066 Automatically discoverable Protein sequence analysis services
Mateusz Warowny [Fri, 27 Sep 2019 10:58:29 +0000 (11:58 +0100)]
Merge remote-tracking branch 'origin/tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration
Jim Procter [Thu, 26 Sep 2019 15:38:12 +0000 (16:38 +0100)]
JAL-3070 oops - refactor Slivka’s service stub too :)
Jim Procter [Thu, 26 Sep 2019 15:28:41 +0000 (16:28 +0100)]
JAL-3070 JAL-3066 JAL-3067 refactor annotation web service so client is passed sequences as input, and an alignment object containing result sequences to be annotated.
Jim Procter [Thu, 26 Sep 2019 15:25:16 +0000 (16:25 +0100)]
JAL-3070 JAL-3066 JAL-2808 allow feature filter definition via FeatureSettingsModelI
Jim Procter [Thu, 26 Sep 2019 15:23:15 +0000 (16:23 +0100)]
JAL-3070 allow SequenceI.findPositions(0,column+1) to return range between 1 and column+1
Jim Procter [Thu, 26 Sep 2019 15:22:12 +0000 (16:22 +0100)]
JAL-3070 cope when dataset sequence is passed
Jim Procter [Thu, 26 Sep 2019 12:28:07 +0000 (13:28 +0100)]
JAL-3070 JAL-3066 formatting
Jim Procter [Thu, 26 Sep 2019 12:27:55 +0000 (13:27 +0100)]
JAL-3070 JAL-3066 AlignmentI.findOrAddAnnotation(AlignmentAnnotation ala) - calls copy constructor or the AlignmentAnnotation.updateAlignmentAnnotationFrom method to sync alignment annotation with annotation generated by a service
Jim Procter [Tue, 24 Sep 2019 17:29:10 +0000 (18:29 +0100)]
JAL-3070 tidying
Jim Procter [Mon, 23 Sep 2019 15:52:31 +0000 (16:52 +0100)]
JAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annotation style web services
Mateusz Warowny [Mon, 23 Sep 2019 15:01:54 +0000 (16:01 +0100)]
JAL-3066 Annotation Service Instance stub
Mateusz Warowny [Mon, 23 Sep 2019 15:01:34 +0000 (16:01 +0100)]
SlivkaWSDiscoverer formatting fix
Mateusz Warowny [Mon, 23 Sep 2019 13:07:43 +0000 (14:07 +0100)]
JAL-3066 Move common web service methods to abstract SlivkaWSInstance
ServiceWithParameters and JalviewWebService overriden methods would be common to both Msa and Annotation services thus they are moved to the common abstract base class.
Jim Procter [Mon, 23 Sep 2019 10:45:14 +0000 (11:45 +0100)]
Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3066_Jalview_212_slivka-integration
Jim Procter [Mon, 23 Sep 2019 10:30:06 +0000 (11:30 +0100)]
JAL-3070 configure annotation service manager from service’s input validation flags
Jim Procter [Mon, 23 Sep 2019 09:36:19 +0000 (10:36 +0100)]
JAL-3070 rename AbstractJabaCalcWorker to SeqAnnotationServiceCalcWorker
Jim Procter [Mon, 23 Sep 2019 09:29:44 +0000 (10:29 +0100)]
JAL-3070 ensure RNAAliFold annotation rows display correctly
Jim Procter [Mon, 23 Sep 2019 08:38:40 +0000 (09:38 +0100)]
JAL-3070 formatting
Jim Procter [Mon, 23 Sep 2019 08:38:33 +0000 (09:38 +0100)]
JAL-3070 detect presence of existing JABA RNAAliFold client
Jim Procter [Mon, 23 Sep 2019 08:15:32 +0000 (09:15 +0100)]
JAL-3070 match AbstractJabaCalcWorker’s annotation service interface with class from the aaui field to enable/disable tick box
Jim Procter [Mon, 23 Sep 2019 08:14:18 +0000 (09:14 +0100)]
JAL-3070 javadoc for (mostly) jabaws specific methods
Jim Procter [Fri, 20 Sep 2019 16:01:57 +0000 (17:01 +0100)]
JAL-3070 rough-and-ready refactor of JABA SequenceAnnotation style services - needs some review and refinement
Jim Procter [Fri, 20 Sep 2019 15:56:01 +0000 (16:56 +0100)]
JAL-3070 JAL-1379 deferred work on annotation based on JABAWS MSA service (e.g. Jpred3 Jabaws 2.1 deprecated service)
Jim Procter [Fri, 20 Sep 2019 12:06:13 +0000 (13:06 +0100)]
JAL-3070 JAL-2507 fix up test output and honour the ‘ignoreFeatures’ flag when testing alignment equivalence (this broke disorderAnnotExportImport tests)
Mateusz Warowny [Thu, 19 Sep 2019 13:35:46 +0000 (14:35 +0100)]
JAL-3066 Auto discover multiple sequence alignment services
Jim Procter [Tue, 17 Sep 2019 10:53:42 +0000 (11:53 +0100)]
JAL-3432 hide the slider when validator has no min or max
Mateusz Warowny [Mon, 16 Sep 2019 12:17:12 +0000 (13:17 +0100)]
Set the initial value of the choice field to the default value.
Mateusz Warowny [Mon, 16 Sep 2019 12:16:43 +0000 (13:16 +0100)]
Add the remaining msa services to the Discoverer
Mateusz Warowny [Wed, 11 Sep 2019 10:19:28 +0000 (11:19 +0100)]
Change choice field to use dropbox instead of radio buttons.
Mateusz Warowny [Wed, 11 Sep 2019 10:18:38 +0000 (11:18 +0100)]
Create generic msa service instance
Mateusz Warowny [Fri, 6 Sep 2019 17:09:48 +0000 (18:09 +0100)]
Merge remote-tracking branch 'origin/alpha/JAL-3066_Jalview_212_slivka-integration' into alpha/JAL-3066_Jalview_212_slivka-integration
Mateusz Warowny [Fri, 6 Sep 2019 17:07:04 +0000 (18:07 +0100)]
JAL-3066 Working custom parameters for clustalo
Jim Procter [Fri, 6 Sep 2019 16:04:55 +0000 (17:04 +0100)]
JAL-3066 fix compile error (@matesuz - this will conflict :) )
Jim Procter [Fri, 6 Sep 2019 16:04:13 +0000 (17:04 +0100)]
JAL_1426 JAL-3066 update Apache James mime parser and fix deprecation warnings with HttpMultiPartEntity
Mateusz Warowny [Fri, 6 Sep 2019 14:22:02 +0000 (15:22 +0100)]
JAL-1426 Replacing old apache-http jars.
Mateusz Warowny [Thu, 5 Sep 2019 16:00:38 +0000 (17:00 +0100)]
JAL-3066 Implement clustaloWS using slivka system.
Jim Procter [Tue, 13 Aug 2019 15:50:58 +0000 (16:50 +0100)]
JAL-3362 keep Java 1.8 build happy by specifying generic type arguments
Jim Procter [Tue, 13 Aug 2019 15:22:01 +0000 (16:22 +0100)]
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212
gmungoc [Fri, 9 Aug 2019 08:01:10 +0000 (09:01 +0100)]
JAL-3187 removal of variant feature (non-virtual) transfer to protein
gmungoc [Wed, 7 Aug 2019 09:25:09 +0000 (10:25 +0100)]
JAL-3187 (fudge) look in both alignments for stored mappings
gmungoc [Wed, 7 Aug 2019 08:42:01 +0000 (09:42 +0100)]
Merge branch 'develop' into feature/JAL-3187linkedFeatures
gmungoc [Wed, 31 Jul 2019 11:59:39 +0000 (12:59 +0100)]
JAL-3389 add .py to restored Chimera session filename so it opens!
gmungoc [Wed, 31 Jul 2019 08:10:11 +0000 (09:10 +0100)]
Merge branch 'bug/JAL-3388structureChooserSorting' into develop
gmungoc [Tue, 30 Jul 2019 17:45:21 +0000 (18:45 +0100)]
JAL-3198 more efficient Sequence.getDisplayId()
gmungoc [Tue, 30 Jul 2019 16:51:13 +0000 (17:51 +0100)]
JAL-3388 correct class for column 0 Ref Sequence
gmungoc [Mon, 29 Jul 2019 14:48:30 +0000 (15:48 +0100)]
JAL-3386 correct wrapped width calculation for headless image export
gmungoc [Mon, 29 Jul 2019 14:35:22 +0000 (15:35 +0100)]
JAL-3377 more reused of SeqCanvas.computeWrappedGeometry
gmungoc [Mon, 29 Jul 2019 10:44:06 +0000 (11:44 +0100)]
JAL-3377 add seq-annotations gap to cheight not to hgap
gmungoc [Mon, 29 Jul 2019 10:34:05 +0000 (11:34 +0100)]
JAL-3377 Javadoc added for getWrappedHeight()
gmungoc [Sun, 28 Jul 2019 10:05:32 +0000 (11:05 +0100)]
JAL-3377 corrected wrapped widths height for IdCanvas
gmungoc [Mon, 29 Jul 2019 10:20:44 +0000 (11:20 +0100)]
JAL-3377 include seq-annotation spacing in getWrappedHeight()
gmungoc [Fri, 26 Jul 2019 18:42:30 +0000 (20:42 +0200)]
Merge branch 'features/JAL-3375vcfValidation' into
feature/JAL-3187linkedFeatures
Conflicts:
src/jalview/io/vcf/VCFLoader.java
test/jalview/io/vcf/VCFLoaderTest.java
gmungoc [Fri, 26 Jul 2019 16:52:01 +0000 (18:52 +0200)]
JAL-1793 only decode specific special characters in VCF data
gmungoc [Fri, 26 Jul 2019 15:58:06 +0000 (17:58 +0200)]
JAL-3376 capture VCF POS, ID, QUAL, FILTER as feature attributes
gmungoc [Fri, 26 Jul 2019 13:40:28 +0000 (15:40 +0200)]
JAL-3375 format validate VCF Integer and Float fields
gmungoc [Thu, 25 Jul 2019 10:48:33 +0000 (12:48 +0200)]
JAL-3375 ignore '.' values for VCF data
gmungoc [Tue, 16 Jul 2019 16:13:19 +0000 (17:13 +0100)]
Merge branch 'develop' into feature/JAL-3187linkedFeatures
gmungoc [Tue, 16 Jul 2019 10:23:35 +0000 (11:23 +0100)]
JAL-2987 tolerate null double values when formatting JTable
Jim Procter [Mon, 15 Jul 2019 16:21:05 +0000 (17:21 +0100)]
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha
Thomas [Fri, 12 Jul 2019 14:46:32 +0000 (15:46 +0100)]
JAL-2629 can now choose number of jackhmmer iterations
Thomas [Fri, 12 Jul 2019 13:44:44 +0000 (14:44 +0100)]
JAL-2629 fix faulty label in a MessageManager.getString() call
Thomas [Fri, 12 Jul 2019 13:43:55 +0000 (14:43 +0100)]
JAL-2629 add sort by evalue and bit score
Thomas [Fri, 12 Jul 2019 13:42:48 +0000 (14:42 +0100)]
JAL-2629 hmmer searches now read domain rather than full scores
Jim Procter [Thu, 11 Jul 2019 15:59:28 +0000 (16:59 +0100)]
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_212_alpha
Thomas [Thu, 11 Jul 2019 14:11:52 +0000 (15:11 +0100)]
JAL-2629 hmmer searches include seqs past inclusion threshold in output
Thomas [Thu, 11 Jul 2019 13:47:42 +0000 (14:47 +0100)]
JAL-2629 hmm search UI and structural improvements, inclusion thresholds
Jim Procter [Wed, 10 Jul 2019 16:46:23 +0000 (17:46 +0100)]
JAL-3070 standard way of storing/recovering documentation URL for service