jalview.git
6 years agoJAL-3063 top level element added to JalviewWsParamSet.xsd
gmungoc [Fri, 28 Sep 2018 11:29:28 +0000 (12:29 +0100)]
JAL-3063 top level element added to JalviewWsParamSet.xsd

6 years agoJAL-3063 comments re use of xjc to generate Java binding classes
gmungoc [Fri, 28 Sep 2018 11:28:54 +0000 (12:28 +0100)]
JAL-3063 comments re use of xjc to generate Java binding classes

6 years agoJAL-3063 tidy commented out code
gmungoc [Mon, 24 Sep 2018 07:53:16 +0000 (08:53 +0100)]
JAL-3063 tidy commented out code

6 years agoJAL-3063 wrappers with check for null getting optional Integer, Float,
gmungoc [Fri, 21 Sep 2018 13:52:20 +0000 (14:52 +0100)]
JAL-3063 wrappers with check for null getting optional Integer, Float,
Boolean XML attributes

6 years agoJAL-3063 use JAXB for 'Save as Project' and load project from parameter
gmungoc [Wed, 19 Sep 2018 08:07:49 +0000 (09:07 +0100)]
JAL-3063 use JAXB for 'Save as Project' and load project from parameter

6 years agoJAL-3063 unit test for save/load project switched to JAXB
gmungoc [Wed, 19 Sep 2018 07:03:38 +0000 (08:03 +0100)]
JAL-3063 unit test for save/load project switched to JAXB

6 years agoJAL-3063 Save/Load user defined colours using JAXB
gmungoc [Tue, 18 Sep 2018 16:43:03 +0000 (17:43 +0100)]
JAL-3063 Save/Load user defined colours using JAXB

6 years agoJAL-3063 Save/Load user colour scheme using JAXB
gmungoc [Tue, 18 Sep 2018 15:58:25 +0000 (16:58 +0100)]
JAL-3063 Save/Load user colour scheme using JAXB

6 years agoJAL-3063 top level element added to colours schema, JAXB classes regen'd
gmungoc [Tue, 18 Sep 2018 15:57:42 +0000 (16:57 +0100)]
JAL-3063 top level element added to colours schema, JAXB classes regen'd

6 years agoJAL-3063 New View via JAXB
gmungoc [Tue, 18 Sep 2018 15:18:13 +0000 (16:18 +0100)]
JAL-3063 New View via JAXB

6 years agoJAL-3063 temporary extra menu option to save/load project as JAXB
gmungoc [Tue, 18 Sep 2018 15:03:09 +0000 (16:03 +0100)]
JAL-3063 temporary extra menu option to save/load project as JAXB

6 years agoJAL-3063 first version of Jalview2XML using JAXB to (un)marshal
gmungoc [Tue, 18 Sep 2018 15:02:34 +0000 (16:02 +0100)]
JAL-3063 first version of Jalview2XML using JAXB to (un)marshal

6 years agoJAL-3063 JAXB binding classes generated by xjc from jalview.xsd
gmungoc [Tue, 18 Sep 2018 15:01:52 +0000 (16:01 +0100)]
JAL-3063 JAXB binding classes generated by xjc from jalview.xsd

6 years agoJAL-3063 tweak schema so JAXB tool xjc recognises XML root element
gmungoc [Tue, 18 Sep 2018 15:01:07 +0000 (16:01 +0100)]
JAL-3063 tweak schema so JAXB tool xjc recognises XML root element

6 years agoJAL-3063 tweak schema so JAXB generates enums for enumerated values
gmungoc [Tue, 18 Sep 2018 15:00:20 +0000 (16:00 +0100)]
JAL-3063 tweak schema so JAXB generates enums for enumerated values

6 years agoJAL-3116 test method renamed to match code
gmungoc [Mon, 17 Sep 2018 10:51:43 +0000 (11:51 +0100)]
JAL-3116 test method renamed to match code

6 years agoJAL-3116 unit tests adapted to EMBL over JAXB
gmungoc [Mon, 17 Sep 2018 10:47:51 +0000 (11:47 +0100)]
JAL-3116 unit tests adapted to EMBL over JAXB

6 years agoJAL-3116 parse EMBL XML with JAXB (todo: update unit tests)
gmungoc [Fri, 14 Sep 2018 16:11:40 +0000 (17:11 +0100)]
JAL-3116 parse EMBL XML with JAXB (todo: update unit tests)

6 years agoJAL-3116 Uniprot XML unmarshalled using JAXB not Castor
gmungoc [Thu, 13 Sep 2018 15:28:27 +0000 (16:28 +0100)]
JAL-3116 Uniprot XML unmarshalled using JAXB not Castor

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Wed, 12 Sep 2018 15:30:52 +0000 (16:30 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

6 years agoMerge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
Jim Procter [Wed, 12 Sep 2018 15:20:51 +0000 (16:20 +0100)]
Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Wed, 12 Sep 2018 11:27:21 +0000 (12:27 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

6 years agoJAL-1551 reinstated Save actions
gmungoc [Wed, 12 Sep 2018 10:59:39 +0000 (11:59 +0100)]
JAL-1551 reinstated Save actions

6 years agoJAL-3112 increased TEST_TIMEOUT to 9000ms - needed after inclusion discovered class...
Jim Procter [Tue, 11 Sep 2018 15:06:03 +0000 (16:06 +0100)]
JAL-3112 increased TEST_TIMEOUT to 9000ms - needed after inclusion discovered class path entries

6 years agoJAL-3112 Use classgraph to reconstruct the classpath for launching Jalview
Jim Procter [Tue, 11 Sep 2018 15:05:02 +0000 (16:05 +0100)]
JAL-3112 Use classgraph to reconstruct the classpath for launching Jalview

6 years agoMerge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
Jim Procter [Tue, 11 Sep 2018 13:05:00 +0000 (14:05 +0100)]
Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop

6 years agoJAL-3111 drop hts-1.33 as a dependency (in favour of htsjdk-2.12)
Jim Procter [Tue, 11 Sep 2018 13:03:50 +0000 (14:03 +0100)]
JAL-3111 drop hts-1.33 as a dependency (in favour of htsjdk-2.12)

6 years agoMerge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop
Jim Procter [Tue, 11 Sep 2018 12:56:41 +0000 (13:56 +0100)]
Merge branch 'merge/JAL-3091_JAL-3111_develop_211' into develop

6 years agoMerge branch 'releases/Release_2_11_Branch' into merge/JAL-3091_develop_211
Jim Procter [Tue, 11 Sep 2018 12:31:09 +0000 (13:31 +0100)]
Merge branch 'releases/Release_2_11_Branch' into merge/JAL-3091_develop_211

6 years agoMerge branch 'develop' into releases/Release_2_11_Branch
Jim Procter [Tue, 11 Sep 2018 12:29:37 +0000 (13:29 +0100)]
Merge branch 'develop' into releases/Release_2_11_Branch
JAL-3091 bring 2.11 onto release 2.10.5 to simplify merge

6 years agoJAL-3091 changed release date to 10th September - tweaked release notes. releases/Release_2_10_5_Branch Release_2_10_5
Jim Procter [Sun, 9 Sep 2018 13:14:52 +0000 (14:14 +0100)]
JAL-3091 changed release date to 10th September - tweaked release notes.

6 years agoJAL-3106 normalise extension before checking if it is '.jar' when constructing filefo...
Jim Procter [Sun, 9 Sep 2018 13:04:28 +0000 (14:04 +0100)]
JAL-3106 normalise extension before checking if it is '.jar' when constructing fileformat/extension name index

6 years agoJAL-3107 update any group associated annotation rows when a new group is created
Jim Procter [Fri, 7 Sep 2018 14:05:27 +0000 (15:05 +0100)]
JAL-3107 update any group associated annotation rows when a new group is created

6 years agoJAL-2988 JAL-2968 renamed patched VAqua5 to VAqua5-patch.jar and documented patch...
Jim Procter [Fri, 7 Sep 2018 13:51:13 +0000 (14:51 +0100)]
JAL-2988 JAL-2968 renamed patched VAqua5 to VAqua5-patch.jar and documented patch along with instructions for rebuilding the jar

6 years agoJAL-2988 if selected file is null (On Java 10/OSX - happens if user has entered text...
Jim Procter [Fri, 7 Sep 2018 13:24:20 +0000 (14:24 +0100)]
JAL-2988 if selected file is null (On Java 10/OSX - happens if user has entered text after selecting a file), try and get the filename from the UI. If no file can be gotten, cancel the save operation

6 years agoJAL-2988 workaround: overload getSelectedFile() because calling setSelectedFile(...
Jim Procter [Fri, 7 Sep 2018 13:23:16 +0000 (14:23 +0100)]
JAL-2988 workaround: overload getSelectedFile() because calling setSelectedFile(..) results in getSelectedFile()==null on OSX/Java 10/VAqua4/5.

6 years agoJAL-3106 use .jvp as default
Jim Procter [Fri, 7 Sep 2018 13:19:28 +0000 (14:19 +0100)]
JAL-3106 use .jvp as default

6 years agoJAL-3105 fix for focus transfer after window closed on OSX
Jim Procter [Fri, 7 Sep 2018 11:24:10 +0000 (12:24 +0100)]
JAL-3105 fix for focus transfer after window closed on OSX

6 years agoJAL-3091 code committed in error (failed patch for JAL-2854)
Jim Procter [Thu, 6 Sep 2018 19:51:47 +0000 (20:51 +0100)]
JAL-3091 code committed in error (failed patch for JAL-2854)

6 years agoJAL-3091 release notes for JAL-3104
Jim Procter [Thu, 6 Sep 2018 19:41:29 +0000 (20:41 +0100)]
JAL-3091 release notes for JAL-3104

6 years agoJAL-3105 reallocate quality and consensus annotation rows so old values aren’t render...
Jim Procter [Thu, 6 Sep 2018 19:37:06 +0000 (20:37 +0100)]
JAL-3105 reallocate quality and consensus annotation rows so old values aren’t rendered when alignments become shorter

6 years agoJAL-2854 compute visible annotation panel height and provide it directly to via Scrol...
Jim Procter [Thu, 6 Sep 2018 19:33:43 +0000 (20:33 +0100)]
JAL-2854 compute visible annotation panel height and provide it directly to via Scrollable interface

6 years agoJAL-3065 don’t quote class path args for Runtime.exec java launch command (needs...
Jim Procter [Wed, 5 Sep 2018 17:12:14 +0000 (18:12 +0100)]
JAL-3065 don’t quote class path args for Runtime.exec java launch command (needs to be ported to 2.11)

6 years agoJAL-3091 update whats new!
Jim Procter [Wed, 5 Sep 2018 16:58:24 +0000 (17:58 +0100)]
JAL-3091 update whats new!

6 years agoJAL-3091 update Java 10 known issues/workarounds in whats new
Jim Procter [Wed, 5 Sep 2018 14:14:08 +0000 (15:14 +0100)]
JAL-3091 update Java 10 known issues/workarounds in whats new

6 years agoJAL-3091 known defect in whats new for Java 10 issues: JAL-3103 JAL-3102
Jim Procter [Wed, 5 Sep 2018 13:59:24 +0000 (14:59 +0100)]
JAL-3091 known defect in whats new for Java 10 issues: JAL-3103 JAL-3102

6 years agoJAL-3091 add Ben Soares to authors list and switch ordering of Toch and Kira (since...
Jim Procter [Wed, 5 Sep 2018 13:34:25 +0000 (14:34 +0100)]
JAL-3091 add Ben Soares to authors list and switch ordering of Toch and Kira (since Kira left after Toch).

6 years agoJAL-3091 release notes for updated memory settings
Jim Procter [Wed, 5 Sep 2018 13:28:50 +0000 (14:28 +0100)]
JAL-3091 release notes for updated memory settings

6 years agoJAL-3091 release notes
Jim Procter [Wed, 5 Sep 2018 12:59:51 +0000 (13:59 +0100)]
JAL-3091 release notes

6 years agoJAL-3101 increase default heap size in IA and JNLP generation, and generate a jalview...
Jim Procter [Wed, 5 Sep 2018 12:57:15 +0000 (13:57 +0100)]
JAL-3101 increase default heap size in IA and JNLP generation, and generate a jalview_256MB.jnlp file for backwards compatibility

6 years agoMerge branch 'patch/VAqua_saveload_update_JAL-2988' into releases/Release_2_10_5_Branch
Jim Procter [Wed, 5 Sep 2018 10:06:54 +0000 (11:06 +0100)]
Merge branch 'patch/VAqua_saveload_update_JAL-2988' into releases/Release_2_10_5_Branch

6 years agoJAL-2988 update InstallAnywhere install dependencies for VAqua5 patch/VAqua_saveload_update_JAL-2988
Jim Procter [Wed, 5 Sep 2018 10:06:00 +0000 (11:06 +0100)]
JAL-2988 update InstallAnywhere install dependencies for VAqua5

6 years agoMerge branch 'bug/JAL-3076ensemblGeneId' into develop
Jim Procter [Wed, 5 Sep 2018 09:42:11 +0000 (10:42 +0100)]
Merge branch 'bug/JAL-3076ensemblGeneId' into develop

6 years agoJAL-3091 release date set for Thursday 6th September
Jim Procter [Wed, 5 Sep 2018 08:04:19 +0000 (09:04 +0100)]
JAL-3091 release date set for Thursday 6th September

6 years agoMerge branch 'bug/JAL-3065_DH_keyPair_Exception_nogroovysettings' into releases/Relea...
Jim Procter [Wed, 5 Sep 2018 08:03:37 +0000 (09:03 +0100)]
Merge branch 'bug/JAL-3065_DH_keyPair_Exception_nogroovysettings' into releases/Release_2_10_5_Branch

6 years agoJAL-3065 - amended commit 4906697ab6e5a79fbce3baae89f7f64178c9a739 to exclude ... bug/JAL-3065_DH_keyPair_Exception_nogroovysettings
Jim Procter [Wed, 5 Sep 2018 08:01:50 +0000 (09:01 +0100)]
JAL-3065 - amended commit  4906697ab6e5a79fbce3baae89f7f64178c9a739  to exclude .settings/..groovy
    Added notes to the instructions, also adjusted the jalviewDesktopRunner
    test to lookup OS and use ';' or ':' accordingly.
    All the CommandLineOperations tests failed on my (hastily set up) linux
    box, so I'm committing and will test on MacOS too.

6 years agoJAL-3091 JAL-2988 release notes re Java 10 and OSX
Jim Procter [Tue, 4 Sep 2018 12:02:44 +0000 (13:02 +0100)]
JAL-3091 JAL-2988 release notes re Java 10 and OSX

6 years agoMerge branch 'patch/VAqua_saveload_update_JAL-2988' into releases/Release_2_10_5_Branch
Jim Procter [Mon, 3 Sep 2018 18:58:18 +0000 (19:58 +0100)]
Merge branch 'patch/VAqua_saveload_update_JAL-2988' into releases/Release_2_10_5_Branch

6 years agoMerge branch 'releases/Release_2_10_5_Branch' of http://source.jalview.org/git/jalvie...
Jim Procter [Mon, 3 Sep 2018 18:48:42 +0000 (19:48 +0100)]
Merge branch 'releases/Release_2_10_5_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_5_Branch

6 years agoJAL-3091 -Dnosign to disable jar signing phase of build
Jim Procter [Mon, 3 Sep 2018 15:45:51 +0000 (16:45 +0100)]
JAL-3091 -Dnosign to disable jar signing phase of build

6 years agoJAL-3091 -Dnosign to disable jar signing phase of build
Jim Procter [Mon, 3 Sep 2018 15:45:51 +0000 (16:45 +0100)]
JAL-3091 -Dnosign to disable jar signing phase of build

6 years agoJAL-3091 release notes and whats new !
Jim Procter [Mon, 3 Sep 2018 15:45:23 +0000 (16:45 +0100)]
JAL-3091 release notes and whats new !

6 years agoMerge branch 'trialMerge' into releases/Release_2_10_5_Branch
gmungoc [Mon, 3 Sep 2018 14:04:14 +0000 (15:04 +0100)]
Merge branch 'trialMerge' into releases/Release_2_10_5_Branch

6 years agoJAL-3076 fetch Ensembl sequence as JSON instead of Fasta
gmungoc [Fri, 10 Aug 2018 09:59:42 +0000 (10:59 +0100)]
JAL-3076 fetch Ensembl sequence as JSON instead of Fasta

Conflicts:
src/jalview/ext/ensembl/EnsemblInfo.java
src/jalview/ext/ensembl/EnsemblMap.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java

6 years agoJAL-3065 release notes
Jim Procter [Mon, 3 Sep 2018 13:26:54 +0000 (14:26 +0100)]
JAL-3065 release notes

6 years agoMerge branch 'bug/JAL-3065_DH_keyPair_Exception' into releases/Release_2_10_5_Branch
Jim Procter [Mon, 3 Sep 2018 13:22:58 +0000 (14:22 +0100)]
Merge branch 'bug/JAL-3065_DH_keyPair_Exception' into releases/Release_2_10_5_Branch

6 years agoJAL-3076 clarify javadoc handling single sequence response for Ensembl REST sequence_... bug/JAL-3076ensemblGeneId
Jim Procter [Mon, 3 Sep 2018 13:03:54 +0000 (14:03 +0100)]
JAL-3076 clarify javadoc handling single sequence response for Ensembl REST sequence_id endpoint

6 years agoJAL-3087 release notes
Jim Procter [Mon, 3 Sep 2018 12:33:35 +0000 (13:33 +0100)]
JAL-3087 release notes

6 years agoJAL-3095 account for sequence start when highlighting selections in trimmed VARNA...
Jim Procter [Fri, 31 Aug 2018 15:08:32 +0000 (16:08 +0100)]
JAL-3095 account for sequence start when highlighting selections in trimmed VARNA model

6 years agoJAL-3053 JAL-3061 JAL-3095 release notes
Jim Procter [Fri, 31 Aug 2018 15:03:42 +0000 (16:03 +0100)]
JAL-3053 JAL-3061 JAL-3095 release notes

6 years agoMerge branch 'bug/JAL-3061_RNA_secondary_structure_annotation_gap_character' into...
Jim Procter [Fri, 31 Aug 2018 14:04:32 +0000 (15:04 +0100)]
Merge branch 'bug/JAL-3061_RNA_secondary_structure_annotation_gap_character' into releases/Release_2_10_5_Branch

6 years agoMerge branch 'releases/Release_2_10_5_Branch' of http://source.jalview.org/git/jalvie...
Jim Procter [Fri, 31 Aug 2018 11:12:46 +0000 (12:12 +0100)]
Merge branch 'releases/Release_2_10_5_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_5_Branch

6 years agoJAL-3095 release notes
Jim Procter [Fri, 31 Aug 2018 11:12:20 +0000 (12:12 +0100)]
JAL-3095 release notes

6 years agojava doc and fix for JAL-3095 - region of trimmed RNA model to highlight is indexed...
Jim Procter [Fri, 31 Aug 2018 11:10:26 +0000 (12:10 +0100)]
java doc and fix for JAL-3095 - region of trimmed RNA model to highlight is indexed relative to SeuqenceI.getStart()

6 years agoJAL-3003 remove redundant call to drawSelectionGroup
gmungoc [Fri, 31 Aug 2018 10:49:00 +0000 (11:49 +0100)]
JAL-3003 remove redundant call to drawSelectionGroup

6 years agoJAL-3092 release notes
Jim Procter [Thu, 30 Aug 2018 15:34:58 +0000 (16:34 +0100)]
JAL-3092 release notes

6 years agoJAL-3092 make sure base pair counter is always moved in loop that computes the helix...
Jim Procter [Thu, 30 Aug 2018 15:31:37 +0000 (16:31 +0100)]
JAL-3092 make sure base pair counter is always moved in loop that computes the helix count for a strand of RNA secondary structure

6 years agoJAL-3091 release notes for JAL-3003 JAL-3059
Jim Procter [Wed, 29 Aug 2018 09:17:25 +0000 (10:17 +0100)]
JAL-3091 release notes for JAL-3003 JAL-3059

6 years agoJAL-3003 different coloured borders in demo annotation file
Jim Procter [Tue, 28 Aug 2018 16:11:48 +0000 (17:11 +0100)]
JAL-3003 different coloured borders in demo annotation file

6 years agoJAL-3059 use correct border colour for groups
gmungoc [Thu, 23 Aug 2018 12:28:52 +0000 (13:28 +0100)]
JAL-3059 use correct border colour for groups

6 years agoJAL-3003 draw selection group outline on main graphics context
gmungoc [Thu, 23 Aug 2018 12:27:10 +0000 (13:27 +0100)]
JAL-3003 draw selection group outline on main graphics context

6 years agoJAL-247 release notes
Jim Procter [Tue, 28 Aug 2018 15:28:38 +0000 (16:28 +0100)]
JAL-247 release notes

6 years agoJAL-247 comment to clarify wrapped print algorithm
gmungoc [Mon, 27 Aug 2018 09:19:28 +0000 (10:19 +0100)]
JAL-247 comment to clarify wrapped print algorithm

6 years agoJAL-247 print/export wrapped uses common code to draw seq ids and
gmungoc [Fri, 24 Aug 2018 15:16:08 +0000 (16:16 +0100)]
JAL-247 print/export wrapped uses common code to draw seq ids and
annotation labels

6 years agoJAL-3087 include full alignment height in repeating wrapped height
gmungoc [Fri, 24 Aug 2018 14:32:44 +0000 (15:32 +0100)]
JAL-3087 include full alignment height in repeating wrapped height

6 years agoJAL-247 draw/print sequence ids now uses common code (unwrapped case)
gmungoc [Fri, 24 Aug 2018 09:06:41 +0000 (10:06 +0100)]
JAL-247 draw/print sequence ids now uses common code (unwrapped case)

6 years agoJAL-3091 release 2.10.5 added to release notes
Jim Procter [Tue, 28 Aug 2018 15:16:56 +0000 (16:16 +0100)]
JAL-3091 release 2.10.5 added to release notes

6 years agoJAL-3061 / JAL-3053
Ben Soares [Mon, 27 Aug 2018 15:50:20 +0000 (16:50 +0100)]
JAL-3061 / JAL-3053

Fixed broken StockholmFileTest tests
curlyWUSSsecondaryStructureForRNASequence
fullWUSSsecondaryStructureForRNASequence
by adding " ." as a recognised Annotation.isWhiteSpace displayCharacter
(which happens for StockholmFile '.' RNA SS annotations)

6 years agoJAL-2988 workaround for jalview save as dialogs - clear filename before displaying
Jim Procter [Wed, 22 Aug 2018 13:54:29 +0000 (14:54 +0100)]
JAL-2988 workaround for jalview save as dialogs - clear filename before displaying

6 years agoJAL-2988 JAL-2976 update to latest VAqua release: VAqua5
Jim Procter [Wed, 22 Aug 2018 13:53:11 +0000 (14:53 +0100)]
JAL-2988 JAL-2976 update to latest VAqua release: VAqua5

6 years agoJAL-3080 remove tree partition if no groups created feature/JAL-3080clearTreeGroups
gmungoc [Wed, 15 Aug 2018 10:01:27 +0000 (11:01 +0100)]
JAL-3080 remove tree partition if no groups created

6 years agoJAL-3078 reset Tree font (only!) on Cancel bug/JAL-3078cancelTreeFont
gmungoc [Tue, 14 Aug 2018 15:55:13 +0000 (16:55 +0100)]
JAL-3078 reset Tree font (only!) on Cancel

6 years agoJAL-3018 updated to Ensembl REST 7.0
gmungoc [Fri, 10 Aug 2018 10:59:33 +0000 (11:59 +0100)]
JAL-3018 updated to Ensembl REST 7.0

6 years agoJAL-3076 refactor for more efficient scan of 'gene' features
gmungoc [Fri, 10 Aug 2018 10:58:00 +0000 (11:58 +0100)]
JAL-3076 refactor for more efficient scan of 'gene' features

6 years agoJAL-3076 fetch Ensembl sequence as JSON instead of Fasta
gmungoc [Fri, 10 Aug 2018 09:59:42 +0000 (10:59 +0100)]
JAL-3076 fetch Ensembl sequence as JSON instead of Fasta

6 years agoJAL-3061
Ben Soares [Fri, 3 Aug 2018 16:00:50 +0000 (17:00 +0100)]
JAL-3061
Added test StockholmFileTest.stockholmFileRnaSSSpaceChars() to read in
RNA SS annotation with spaces, and check that StockholmFile print output
converts these to '.'s.
Also slight adjustment to StockholmFile.outputCharacter to avoid a
nullPointer exception.

6 years agoMerge branch 'bug/JAL-3061_RNA_secondary_structure_annotation_gap_character' of https...
Ben Soares [Fri, 3 Aug 2018 14:17:56 +0000 (15:17 +0100)]
Merge branch 'bug/JAL-3061_RNA_secondary_structure_annotation_gap_character' of https://source.jalview.org/git/jalview into bug/JAL-3061_RNA_secondary_structure_annotation_gap_character

6 years agoJAL-3053
Ben Soares [Thu, 2 Aug 2018 16:30:15 +0000 (17:30 +0100)]
JAL-3053
JAL-3061
two bugs with a similar theme (RNA secondary structure annotations)

JAL-3053
This fixes the reading in of Vienna extended dot-bracket notation for
RNA secondary structure annotations (which includes ALPHA/alpha braces).

To avoid (almost all) ambiguity with a protein secondary structure
annotation (Es and Hs), there's a whole-annotation regex match to ensure
some other RNA-based extended dot-bracket feature is present, and then
the reading in can assume an RNA feature set.

Test StockholmFileTest.stockholmFileRnaSSAlphaChars() compares the test
file examples/rna_ss_test.stk with a hard-coded Jalview equivalent. The
Annotation rnasecstr pairing is checked. I've added a sort Comparator
for SequenceFeature to help ensure that check is correct.
--
JAL-3061
There is also a fix for the RNA Secondary Structure annotation output
that was preserving spaces in the output. This is not valid output in
this case, and so a '.' is used instead.

No test for this yet, will add later.

6 years agoMerge branch 'releases/Release_2_10_4_Branch' into bug/JAL-3061_RNA_secondary_structu...
Jim Procter [Wed, 1 Aug 2018 10:33:17 +0000 (11:33 +0100)]
Merge branch 'releases/Release_2_10_4_Branch' into bug/JAL-3061_RNA_secondary_structure_annotation_gap_character

6 years agoMerge branch 'task/JAL-3047_clover2104b1_cherrypick' into releases/Release_2_10_4_Branch releases/Release_2_10_4_Branch
Jim Procter [Wed, 1 Aug 2018 10:32:08 +0000 (11:32 +0100)]
Merge branch 'task/JAL-3047_clover2104b1_cherrypick' into releases/Release_2_10_4_Branch