jalview.git
6 years agoJAL-2773 add new flag to paintAlignment(updateOverview,updateStructures) and first... features/JAL-2773_dontalwaysrecolourstructureonrepaintofoverview
Jim Procter [Thu, 12 Oct 2017 16:40:50 +0000 (17:40 +0100)]
JAL-2773 add new flag to paintAlignment(updateOverview,updateStructures) and first pass at limiting updates of structure to just those that are necessary.

6 years agoJAL-2609 tests updated for revised label width
gmungoc [Wed, 11 Oct 2017 17:46:16 +0000 (18:46 +0100)]
JAL-2609 tests updated for revised label width

6 years agoJAL-2772 check array bounds for sequence access bug/JAL-2772pdbArrayBounds
gmungoc [Wed, 11 Oct 2017 15:17:13 +0000 (16:17 +0100)]
JAL-2772 check array bounds for sequence access

6 years agoJAL-2225 updates for review comments, Checkstyle
gmungoc [Wed, 11 Oct 2017 14:37:55 +0000 (15:37 +0100)]
JAL-2225 updates for review comments, Checkstyle

6 years agoJAL-2609 tidy label width code, some checkstyle warnings
gmungoc [Wed, 11 Oct 2017 14:01:16 +0000 (15:01 +0100)]
JAL-2609 tidy label width code, some checkstyle warnings

6 years agoMerge branch 'bug/JAL-2742' into develop
gmungoc [Wed, 11 Oct 2017 12:41:13 +0000 (13:41 +0100)]
Merge branch 'bug/JAL-2742' into develop

6 years agoJAL-2742 set HiddenColumns null for no hidden coluns test to match
gmungoc [Wed, 11 Oct 2017 12:39:34 +0000 (13:39 +0100)]
JAL-2742 set HiddenColumns null for no hidden coluns test to match
Jalview usage

6 years agoJAL-2757 release notes
Jim Procter [Wed, 11 Oct 2017 11:46:33 +0000 (12:46 +0100)]
JAL-2757 release notes

6 years agoMerge branch 'bug/JAL-2757_uniprotftsbadquery' into develop
gmungoc [Wed, 11 Oct 2017 11:12:54 +0000 (12:12 +0100)]
Merge branch 'bug/JAL-2757_uniprotftsbadquery' into develop

6 years agoJAL-2757 fix PDB also; suppress stack trace and compiler warnings bug/JAL-2757_uniprotftsbadquery
gmungoc [Wed, 11 Oct 2017 11:12:11 +0000 (12:12 +0100)]
JAL-2757 fix PDB also; suppress stack trace and compiler warnings

6 years agoJAL-2742 test updates following review
kiramt [Wed, 11 Oct 2017 11:11:03 +0000 (12:11 +0100)]
JAL-2742 test updates following review

6 years agoJAL-2742 minor test updates following review
kiramt [Wed, 11 Oct 2017 11:08:25 +0000 (12:08 +0100)]
JAL-2742 minor test updates following review

6 years agoJAL-2738 javadoc correction
gmungoc [Wed, 11 Oct 2017 07:59:54 +0000 (08:59 +0100)]
JAL-2738 javadoc correction

6 years agoJAL-2742 removed unused getViewAsCigars
kiramt [Wed, 11 Oct 2017 07:20:21 +0000 (08:20 +0100)]
JAL-2742 removed unused getViewAsCigars

6 years agoJAL-2609attemptedmerge tidy
kiramt [Tue, 10 Oct 2017 13:38:30 +0000 (14:38 +0100)]
JAL-2609attemptedmerge tidy

6 years agoMerge remote-tracking branch 'origin/features/JAL-2609fastPaintWrapped'
kiramt [Tue, 10 Oct 2017 13:34:50 +0000 (14:34 +0100)]
Merge remote-tracking branch 'origin/features/JAL-2609fastPaintWrapped'
into bug/JAL-2690attemptedmerge

Conflicts:
src/jalview/gui/SeqCanvas.java

6 years agoJAL-2690attemptedmerge seems to work
kiramt [Tue, 10 Oct 2017 13:30:43 +0000 (14:30 +0100)]
JAL-2690attemptedmerge seems to work

6 years agoJAL-2392 wrap public progress bar methods as InvokeLater events. Guess we need to...
Jim Procter [Tue, 10 Oct 2017 13:02:37 +0000 (14:02 +0100)]
JAL-2392 wrap public progress bar methods as InvokeLater events. Guess we need to do some thorough testing here !

6 years agoJAL-2392 formatting
Jim Procter [Tue, 10 Oct 2017 13:01:46 +0000 (14:01 +0100)]
JAL-2392 formatting

6 years agoMerge branch 'codereviews/JAL-1990_IProgressIndicator_jalview.structure' into patch...
Jim Procter [Tue, 10 Oct 2017 11:50:03 +0000 (12:50 +0100)]
Merge branch 'codereviews/JAL-1990_IProgressIndicator_jalview.structure' into patch/JAL-1990_JAL-2392_deadlockssm
updated for 2.10.3. Still need to remove jalview.gui.IProgressBar imports from non-swing packages (appletgui, structures, etc)

6 years agoJAL-2523 release notes
Jim Procter [Tue, 10 Oct 2017 11:11:02 +0000 (12:11 +0100)]
JAL-2523 release notes

6 years agoMerge branch 'features/JAL-2523httpRetries' into develop
Jim Procter [Tue, 10 Oct 2017 11:08:51 +0000 (12:08 +0100)]
Merge branch 'features/JAL-2523httpRetries' into develop

6 years agoJAL-2690attemptedmerge partial merge
kiramt [Tue, 10 Oct 2017 10:59:51 +0000 (11:59 +0100)]
JAL-2690attemptedmerge partial merge

6 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Tue, 10 Oct 2017 07:35:30 +0000 (08:35 +0100)]
Merge branch 'develop' into features/JAL-1793VCF

6 years agoJAL-2480 use interface type for sequenceFeatureStore
gmungoc [Mon, 9 Oct 2017 15:03:22 +0000 (16:03 +0100)]
JAL-2480 use interface type for sequenceFeatureStore

6 years agoJAL-2523 basic sleep and retry (3 times) on 429 response code with features/JAL-2523httpRetries
gmungoc [Mon, 9 Oct 2017 14:31:13 +0000 (15:31 +0100)]
JAL-2523 basic sleep and retry (3 times) on 429 response code with
Retry-After

6 years agoJAL-2523 convenience method to get model organisms
gmungoc [Mon, 9 Oct 2017 14:24:10 +0000 (15:24 +0100)]
JAL-2523 convenience method to get model organisms

6 years agoMerge branch 'patch/JAL-2446_mergeconflictmissed' into develop
Jim Procter [Mon, 9 Oct 2017 13:47:00 +0000 (14:47 +0100)]
Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop

6 years agoJAL-2446 remove duplicate code from pulled up method.
Jim Procter [Mon, 9 Oct 2017 13:46:24 +0000 (14:46 +0100)]
JAL-2446 remove duplicate code from pulled up method.

6 years agoJAL-2738 ensure variant feature is in forward sense
gmungoc [Mon, 9 Oct 2017 10:55:55 +0000 (11:55 +0100)]
JAL-2738 ensure variant feature is in forward sense

6 years agoJAL-2738 assertion for derived protein variant added
gmungoc [Mon, 9 Oct 2017 09:27:06 +0000 (10:27 +0100)]
JAL-2738 assertion for derived protein variant added

6 years agoJAL-2738 remove commented code, unit test coverage
gmungoc [Mon, 9 Oct 2017 08:47:42 +0000 (09:47 +0100)]
JAL-2738 remove commented code, unit test coverage

6 years agoMerge branch 'patch/JAL-2116_java9_antjnlpfix' into develop
Jim Procter [Fri, 6 Oct 2017 16:02:42 +0000 (17:02 +0100)]
Merge branch 'patch/JAL-2116_java9_antjnlpfix' into develop

6 years agoJAL-2116 fix jnlp file post-processing so java 9 module path and java version added...
Jim Procter [Fri, 6 Oct 2017 16:01:38 +0000 (17:01 +0100)]
JAL-2116 fix jnlp file post-processing so java 9 module path and java version added correctly

6 years agoJAL-2753 add new jar to lib folder!
gmungoc [Fri, 6 Oct 2017 08:44:35 +0000 (09:44 +0100)]
JAL-2753 add new jar to lib folder!

6 years agoJAL-2753 update to htsjdk 2.12.0 (requires Java 8)
gmungoc [Fri, 6 Oct 2017 08:40:05 +0000 (09:40 +0100)]
JAL-2753 update to htsjdk 2.12.0 (requires Java 8)

6 years agoJAL-2754 update to Java 1.8
gmungoc [Fri, 6 Oct 2017 08:39:02 +0000 (09:39 +0100)]
JAL-2754 update to Java 1.8

6 years agoJAL-2738 unit test for mapping failure case
gmungoc [Fri, 6 Oct 2017 08:16:13 +0000 (09:16 +0100)]
JAL-2738 unit test for mapping failure case

6 years agoJAL-2757 reset textbox after a non HTTP 200 response
Jim Procter [Thu, 5 Oct 2017 17:59:09 +0000 (18:59 +0100)]
JAL-2757 reset textbox after a non HTTP 200 response

6 years agoJAL-2738 warn (in console) when non chromosomal coordinates on sequence
gmungoc [Thu, 5 Oct 2017 14:18:01 +0000 (15:18 +0100)]
JAL-2738 warn (in console) when non chromosomal coordinates on sequence

6 years agoJAL-2738 helper method for convolving mappings
gmungoc [Thu, 5 Oct 2017 14:17:19 +0000 (15:17 +0100)]
JAL-2738 helper method for convolving mappings

6 years agoJAL-2755 transfer chromosomal reference from transcript to CDS
gmungoc [Thu, 5 Oct 2017 14:16:49 +0000 (15:16 +0100)]
JAL-2755 transfer chromosomal reference from transcript to CDS

6 years agoJAL-2738 method to compound / traverse / convolve two mappings
gmungoc [Thu, 5 Oct 2017 14:15:41 +0000 (15:15 +0100)]
JAL-2738 method to compound / traverse / convolve two mappings

6 years agoJAL-2744 add score to feature details report, description to menu item
gmungoc [Thu, 5 Oct 2017 09:41:46 +0000 (10:41 +0100)]
JAL-2744 add score to feature details report, description to menu item

6 years agoJAL-2738 fix bug of premature exit from adding attributes
gmungoc [Wed, 4 Oct 2017 14:19:02 +0000 (15:19 +0100)]
JAL-2738 fix bug of premature exit from adding attributes

6 years agoJAL-2523 start of refactoring...
gmungoc [Wed, 4 Oct 2017 12:55:17 +0000 (13:55 +0100)]
JAL-2523 start of refactoring...

6 years agoJAL-2738 match consequence "Allele" to VCF allele; add non-SNP variants
gmungoc [Wed, 4 Oct 2017 10:31:12 +0000 (11:31 +0100)]
JAL-2738 match consequence "Allele" to VCF allele; add non-SNP variants
on nucleotide

6 years agoJAL-2744 handle null features list
gmungoc [Wed, 4 Oct 2017 10:29:03 +0000 (11:29 +0100)]
JAL-2744 handle null features list

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch' into develop
Jim Procter [Tue, 3 Oct 2017 14:25:34 +0000 (15:25 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch' into develop

 Conflicts:
help/html/releases.html
help/html/whatsNew.html
src/jalview/ws/dbsources/Uniprot.java

6 years agoJAL-2738 update test for threaded VCFLoader
gmungoc [Tue, 3 Oct 2017 10:21:52 +0000 (11:21 +0100)]
JAL-2738 update test for threaded VCFLoader

6 years agoJAL-2738 code formatting
gmungoc [Tue, 3 Oct 2017 10:21:11 +0000 (11:21 +0100)]
JAL-2738 code formatting

6 years agoJAL-2738 code tidy up, null checks &c
gmungoc [Mon, 2 Oct 2017 17:52:23 +0000 (18:52 +0100)]
JAL-2738 code tidy up, null checks &c

6 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Mon, 2 Oct 2017 14:45:33 +0000 (15:45 +0100)]
Merge branch 'develop' into features/JAL-1793VCF

6 years agoJAL-2525 lookup transcript features by Ontology
gmungoc [Mon, 2 Oct 2017 14:41:02 +0000 (15:41 +0100)]
JAL-2525 lookup transcript features by Ontology

6 years agoJAL-2738 filter VEP consequence data to that for current transcript
gmungoc [Mon, 2 Oct 2017 14:37:01 +0000 (15:37 +0100)]
JAL-2738 filter VEP consequence data to that for current transcript

6 years agoMerge branch 'documentation/JAL-2751patch2102b2' into releases/Release_2_10_2b1_Branch
Jim Procter [Sun, 1 Oct 2017 11:43:41 +0000 (12:43 +0100)]
Merge branch 'documentation/JAL-2751patch2102b2' into releases/Release_2_10_2b1_Branch

6 years agoJAL-2751 what's new for 2.10.2b2 patch
Jim Procter [Sun, 1 Oct 2017 11:42:32 +0000 (12:42 +0100)]
JAL-2751 what's new for 2.10.2b2 patch

6 years agoJAL-2751 patch release notes
Jim Procter [Sun, 1 Oct 2017 11:40:53 +0000 (12:40 +0100)]
JAL-2751 patch release notes

6 years agoJAL-2751 bump version and new releases entry
Jim Procter [Sat, 30 Sep 2017 10:26:15 +0000 (11:26 +0100)]
JAL-2751 bump version and new releases entry

6 years agoMerge branch 'feature/JAL-2745ebiHttps' into develop
Jim Procter [Fri, 29 Sep 2017 16:00:57 +0000 (17:00 +0100)]
Merge branch 'feature/JAL-2745ebiHttps' into develop

6 years agoJAL-2748 JAL-2745 remove uniprot from EBI fetch client test - no longer used in Unipr...
Jim Procter [Fri, 29 Sep 2017 15:48:58 +0000 (16:48 +0100)]
JAL-2748 JAL-2745 remove uniprot from EBI fetch client test - no longer used in Uniprot fetcher

6 years agoJAL-2745 patch tests for https
Jim Procter [Fri, 29 Sep 2017 15:48:21 +0000 (16:48 +0100)]
JAL-2745 patch tests for https

6 years agoJAL-2748 formatting
Jim Procter [Fri, 29 Sep 2017 15:47:59 +0000 (16:47 +0100)]
JAL-2748 formatting

6 years agoJAL-2745 JAL-2748 direct download of XML from uniprot.org
Jim Procter [Fri, 29 Sep 2017 15:47:48 +0000 (16:47 +0100)]
JAL-2745 JAL-2748 direct download of XML from uniprot.org
patch for 2.10.2b1 branch

6 years agoJAL-2748 JAL-2745 remove uniprot from EBI fetch client test - no longer used in Unipr...
Jim Procter [Fri, 29 Sep 2017 15:48:58 +0000 (16:48 +0100)]
JAL-2748 JAL-2745 remove uniprot from EBI fetch client test - no longer used in Uniprot fetcher

6 years agoJAL-2745 patch tests for https
Jim Procter [Fri, 29 Sep 2017 15:48:21 +0000 (16:48 +0100)]
JAL-2745 patch tests for https

6 years agoJAL-2748 formatting
Jim Procter [Fri, 29 Sep 2017 15:47:59 +0000 (16:47 +0100)]
JAL-2748 formatting

6 years agoJAL-2745 JAL-2748 direct download of XML from uniprot.org
Jim Procter [Fri, 29 Sep 2017 15:47:48 +0000 (16:47 +0100)]
JAL-2745 JAL-2748 direct download of XML from uniprot.org

6 years agoJAL-2738 one sequence feature per (SNP) VCF allele
gmungoc [Fri, 29 Sep 2017 15:11:11 +0000 (16:11 +0100)]
JAL-2738 one sequence feature per (SNP) VCF allele

6 years agoJAL-2744 indent CSQ lines to catch the eye
gmungoc [Fri, 29 Sep 2017 15:10:18 +0000 (16:10 +0100)]
JAL-2744 indent CSQ lines to catch the eye

6 years agoMerge branch 'feature/JAL-2745ebiHttps' into develop
Jim Procter [Fri, 29 Sep 2017 10:51:41 +0000 (11:51 +0100)]
Merge branch 'feature/JAL-2745ebiHttps' into develop

6 years agoRevert "JAL-2745 update SIFTS FTP URL to HTTPS"
Jim Procter [Fri, 29 Sep 2017 10:49:49 +0000 (11:49 +0100)]
Revert "JAL-2745 update SIFTS FTP URL to HTTPS"
EBI ftp confirmed to remain accesible via HTTP
This reverts commit c7f663521cb82b94d832015010fa488d3dc7ff58.

6 years agoRevert "JAL-2745 update SIFTS FTP URL to HTTPS"
Jim Procter [Fri, 29 Sep 2017 10:49:49 +0000 (11:49 +0100)]
Revert "JAL-2745 update SIFTS FTP URL to HTTPS"
EBI ftp confirmed to remain accesible via HTTP
This reverts commit c7f663521cb82b94d832015010fa488d3dc7ff58.

6 years agoMerge branch 'feature/JAL-2745ebiHttps' into develop
Jim Procter [Fri, 29 Sep 2017 07:20:59 +0000 (08:20 +0100)]
Merge branch 'feature/JAL-2745ebiHttps' into develop

6 years agoJAL-2745 update default EBI-eye search URL to HTTPS
Jim Procter [Fri, 29 Sep 2017 07:18:53 +0000 (08:18 +0100)]
JAL-2745 update default EBI-eye search URL to HTTPS

6 years agoJAL-2745 update SIFTS FTP URL to HTTPS
Jim Procter [Fri, 29 Sep 2017 07:18:30 +0000 (08:18 +0100)]
JAL-2745 update SIFTS FTP URL to HTTPS

6 years agoJAL-2745 update default EBI-eye search URL to HTTPS feature/JAL-2745ebiHttps
Jim Procter [Fri, 29 Sep 2017 07:18:53 +0000 (08:18 +0100)]
JAL-2745 update default EBI-eye search URL to HTTPS

6 years agoJAL-2745 update SIFTS FTP URL to HTTPS
Jim Procter [Fri, 29 Sep 2017 07:18:30 +0000 (08:18 +0100)]
JAL-2745 update SIFTS FTP URL to HTTPS

6 years agoMerge branch 'feature/JAL-2745ebiHttps' into develop
Jim Procter [Fri, 29 Sep 2017 07:03:39 +0000 (08:03 +0100)]
Merge branch 'feature/JAL-2745ebiHttps' into develop

6 years agoJAL-2745 stderr rather than stdout for unexpected HTTP response
Jim Procter [Fri, 29 Sep 2017 06:58:32 +0000 (07:58 +0100)]
JAL-2745 stderr rather than stdout for unexpected HTTP response

6 years agoJAL-2745 stderr rather than stdout for unexpected HTTP response
Jim Procter [Fri, 29 Sep 2017 06:58:32 +0000 (07:58 +0100)]
JAL-2745 stderr rather than stdout for unexpected HTTP response

6 years agoJAL-2745 update www.ebi.ac.uk to https
gmungoc [Thu, 28 Sep 2017 15:51:30 +0000 (16:51 +0100)]
JAL-2745 update www.ebi.ac.uk to https

6 years agoJAL-2745 update www.ebi.ac.uk to https
gmungoc [Thu, 28 Sep 2017 15:51:30 +0000 (16:51 +0100)]
JAL-2745 update www.ebi.ac.uk to https

6 years agoJAL-2738 separate thread to load VCF; update FeatureSettings when done
gmungoc [Thu, 28 Sep 2017 13:25:12 +0000 (14:25 +0100)]
JAL-2738 separate thread to load VCF; update FeatureSettings when done

6 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Thu, 28 Sep 2017 12:34:10 +0000 (13:34 +0100)]
Merge branch 'develop' into features/JAL-1793VCF

6 years agoJAL-2036 set menus after fully loading AlignFrame
gmungoc [Thu, 28 Sep 2017 12:12:28 +0000 (13:12 +0100)]
JAL-2036 set menus after fully loading AlignFrame

6 years agoJAL-1796 GeneLociI as distinguished DBRefEntry
gmungoc [Thu, 28 Sep 2017 10:21:59 +0000 (11:21 +0100)]
JAL-1796 GeneLociI as distinguished DBRefEntry

6 years agoJAL-2744 simple Feature Details report from Popup menu
gmungoc [Thu, 28 Sep 2017 08:52:45 +0000 (09:52 +0100)]
JAL-2744 simple Feature Details report from Popup menu

6 years agoJAL-2744 refactor PopupMenu constructor to enable adding feature details
gmungoc [Thu, 28 Sep 2017 08:37:46 +0000 (09:37 +0100)]
JAL-2744 refactor PopupMenu constructor to enable adding feature details

6 years agoJAL-2742 uncomment test
kiramt [Tue, 26 Sep 2017 18:37:20 +0000 (19:37 +0100)]
JAL-2742 uncomment test

6 years agoJAL-2742 fixed
kiramt [Tue, 26 Sep 2017 18:33:07 +0000 (19:33 +0100)]
JAL-2742 fixed

6 years agoJAL-2742 CigarArray constructor unit test
kiramt [Tue, 26 Sep 2017 15:35:23 +0000 (16:35 +0100)]
JAL-2742 CigarArray constructor unit test

6 years agoJAL-2738 transfer VCF variant features to CDS sequences
gmungoc [Tue, 26 Sep 2017 12:15:30 +0000 (13:15 +0100)]
JAL-2738 transfer VCF variant features to CDS sequences

6 years agoJAL-2738 JAL-2154 add DBRef from transcript to synthesized CDS and vice
gmungoc [Tue, 26 Sep 2017 12:14:59 +0000 (13:14 +0100)]
JAL-2738 JAL-2154 add DBRef from transcript to synthesized CDS and vice
versa

6 years agoJAL-2738 unit test for reverse strand gene
gmungoc [Tue, 26 Sep 2017 09:17:30 +0000 (10:17 +0100)]
JAL-2738 unit test for reverse strand gene

6 years agoJAL-2738 promote setGeneLoci to SequenceI!
gmungoc [Tue, 26 Sep 2017 09:16:47 +0000 (10:16 +0100)]
JAL-2738 promote setGeneLoci to SequenceI!

6 years agoJAL-2738 use complement base for a VCF variant on reverse strand gene
gmungoc [Mon, 25 Sep 2017 15:38:51 +0000 (16:38 +0100)]
JAL-2738 use complement base for a VCF variant on reverse strand gene

6 years agoJAL-2738 getGeneLoci promoted to SequenceI
gmungoc [Mon, 25 Sep 2017 15:37:55 +0000 (16:37 +0100)]
JAL-2738 getGeneLoci promoted to SequenceI

6 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Mon, 25 Sep 2017 13:46:27 +0000 (14:46 +0100)]
Merge branch 'develop' into features/JAL-1793VCF

6 years agoJAL-2525 return no features if none matches ontology term!
gmungoc [Mon, 25 Sep 2017 13:44:56 +0000 (14:44 +0100)]
JAL-2525 return no features if none matches ontology term!