jalview.git
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 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 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-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-2523 start of refactoring...
gmungoc [Wed, 4 Oct 2017 12:55:17 +0000 (13:55 +0100)]
JAL-2523 start of refactoring...

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-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 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 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-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-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-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!

6 years agoJAL-2739 Fix ported to 2.10.3
kiramt [Fri, 22 Sep 2017 13:09:52 +0000 (14:09 +0100)]
JAL-2739 Fix ported to 2.10.3

6 years agoJAL-2662 Adjustments to hidden columns benchmark
kiramt [Wed, 20 Sep 2017 10:28:01 +0000 (11:28 +0100)]
JAL-2662 Adjustments to hidden columns benchmark

6 years agoJAL-2662 Updated README
kiramt [Tue, 19 Sep 2017 14:26:56 +0000 (15:26 +0100)]
JAL-2662 Updated README

6 years agoJAL-2737 Checkstyle error fixes
kiramt [Tue, 19 Sep 2017 14:23:59 +0000 (15:23 +0100)]
JAL-2737 Checkstyle error fixes

6 years agoJAL-2622 Tidied up gitignore, added to README
kiramt [Tue, 19 Sep 2017 14:10:19 +0000 (15:10 +0100)]
JAL-2622 Tidied up gitignore, added to README

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Tue, 19 Sep 2017 14:05:01 +0000 (15:05 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

6 years agoMerge remote-tracking branch 'origin/task/JAL-2662' into develop
kiramt [Tue, 19 Sep 2017 14:03:14 +0000 (15:03 +0100)]
Merge remote-tracking branch 'origin/task/JAL-2662' into develop

6 years agoMerge remote-tracking branch 'origin/patch/JAL-2732' into develop
gmungoc [Mon, 18 Sep 2017 09:44:25 +0000 (10:44 +0100)]
Merge remote-tracking branch 'origin/patch/JAL-2732' into develop

6 years agoJAL-2728 fine tuned initial split of split frame view
gmungoc [Mon, 18 Sep 2017 08:26:43 +0000 (09:26 +0100)]
JAL-2728 fine tuned initial split of split frame view

6 years agoMerge branch 'documentation/JAL-2698_release2103' into develop
Jim Procter [Fri, 15 Sep 2017 15:37:47 +0000 (16:37 +0100)]
Merge branch 'documentation/JAL-2698_release2103' into develop

6 years agoJAL-2698 new releases.html entry, whatsNew.html and first signoff : JAL-2728
Jim Procter [Fri, 15 Sep 2017 15:37:31 +0000 (16:37 +0100)]
JAL-2698 new releases.html entry, whatsNew.html and first signoff : JAL-2728

6 years agoMerge branch 'bug/JAL-2728splitFrameDivision' into develop
Jim Procter [Fri, 15 Sep 2017 15:21:22 +0000 (16:21 +0100)]
Merge branch 'bug/JAL-2728splitFrameDivision' into develop

6 years agoJAL-1625 ensure we don’t regress on JAL-20 - we always use the DefaultDesktopManager... patch/JAL-2732
Jim Procter [Fri, 15 Sep 2017 15:05:12 +0000 (16:05 +0100)]
JAL-1625 ensure we don’t regress on JAL-20 - we always use the DefaultDesktopManager on Windows

6 years agoJAL-1625 javadoc
Jim Procter [Fri, 15 Sep 2017 15:04:06 +0000 (16:04 +0100)]
JAL-1625 javadoc

6 years agoJAL-2733 redraw after changing the memory status display setting
Jim Procter [Fri, 15 Sep 2017 14:45:46 +0000 (15:45 +0100)]
JAL-2733 redraw after changing the memory status display setting

6 years agoJAL-1625 JAL-1900 preserve the original DesktopManager instance provided by platform...
Jim Procter [Fri, 15 Sep 2017 14:43:46 +0000 (15:43 +0100)]
JAL-1625 JAL-1900 preserve the original DesktopManager instance provided by platform rather than create our own, so iconify works correctly (should mean we also get iconify working in Linux too)

6 years agoJAL-1900 JAL-1625 back out OSX specific double buffer disabling (seems to do nothing)
Jim Procter [Fri, 15 Sep 2017 14:42:50 +0000 (15:42 +0100)]
JAL-1900 JAL-1625 back out OSX specific double buffer disabling (seems to do nothing)

6 years agoJAL-1551 standard code formatting
Jim Procter [Fri, 15 Sep 2017 14:23:58 +0000 (15:23 +0100)]
JAL-1551 standard code formatting

6 years agoJAL-2732 force a redraw after resize/drag to clear any outlines
Jim Procter [Fri, 15 Sep 2017 14:23:15 +0000 (15:23 +0100)]
JAL-2732 force a redraw after resize/drag to clear any outlines

6 years agoJAL-2728 use right denominator for min/max ratio calculations bug/JAL-2728splitFrameDivision
gmungoc [Fri, 15 Sep 2017 14:03:34 +0000 (15:03 +0100)]
JAL-2728 use right denominator for min/max ratio calculations

6 years agoJAL-2728 limit divider to ensure seqs visible (wip!)
gmungoc [Fri, 15 Sep 2017 13:49:05 +0000 (14:49 +0100)]
JAL-2728 limit divider to ensure seqs visible (wip!)

6 years agoJAL-741 add tooltip to feature group checkbox
gmungoc [Fri, 15 Sep 2017 10:00:46 +0000 (11:00 +0100)]
JAL-741 add tooltip to feature group checkbox

6 years agoJAL-2727 null more fields in AlignmentViewport.dispose(); pull up
gmungoc [Thu, 14 Sep 2017 09:05:43 +0000 (10:05 +0100)]
JAL-2727 null more fields in AlignmentViewport.dispose(); pull up
currentTree

6 years agoJAL-2727 add SelectionGroup, Tree and PCA to test
gmungoc [Thu, 14 Sep 2017 09:04:59 +0000 (10:04 +0100)]
JAL-2727 add SelectionGroup, Tree and PCA to test

6 years agoJAL-2727 method to check if PCAPanel thread is working
gmungoc [Thu, 14 Sep 2017 09:03:50 +0000 (10:03 +0100)]
JAL-2727 method to check if PCAPanel thread is working

6 years agoJAL-2727 alignment width and height tailored to this test
gmungoc [Wed, 13 Sep 2017 09:02:31 +0000 (10:02 +0100)]
JAL-2727 alignment width and height tailored to this test

6 years agoJAL-2727 null additional references on close
gmungoc [Wed, 13 Sep 2017 09:01:36 +0000 (10:01 +0100)]
JAL-2727 null additional references on close

6 years agoMerge branch 'bug/JAL-2721fastPaintNPE' into develop
gmungoc [Tue, 12 Sep 2017 13:54:15 +0000 (14:54 +0100)]
Merge branch 'bug/JAL-2721fastPaintNPE' into develop

6 years agoRevert "JAL-2727 null hconsensus, "
gmungoc [Tue, 12 Sep 2017 12:49:29 +0000 (13:49 +0100)]
Revert "JAL-2727 null hconsensus, "

This reverts commit ac2aab2374e46ea0fd499a693f9e13958a3bfbca.

6 years agoJAL-2727 null hconsensus,
gmungoc [Tue, 12 Sep 2017 12:48:32 +0000 (13:48 +0100)]
JAL-2727 null hconsensus,

6 years agoJAL-2727 first pass of test of memory recovery on close all
gmungoc [Tue, 12 Sep 2017 12:47:40 +0000 (13:47 +0100)]
JAL-2727 first pass of test of memory recovery on close all

6 years agoJAL-2727 ensure ViewportRanges (and gapcounts) are nulled when viewport
gmungoc [Tue, 12 Sep 2017 09:48:32 +0000 (10:48 +0100)]
JAL-2727 ensure ViewportRanges (and gapcounts) are nulled when viewport
is closed

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch' of http://source.jalview.org/git...
Jim Procter [Thu, 7 Sep 2017 13:19:03 +0000 (14:19 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_2b1_Branch

6 years agoMerge branch 'bug/JAL-2511idAlignment' into develop
Jim Procter [Thu, 7 Sep 2017 13:18:36 +0000 (14:18 +0100)]
Merge branch 'bug/JAL-2511idAlignment' into develop

6 years agoJAL-2511 release notes for 2.10.2b1
Jim Procter [Thu, 7 Sep 2017 13:17:07 +0000 (14:17 +0100)]
JAL-2511 release notes for 2.10.2b1

6 years agoJAL-2511 release notes for 2.10.2b1
Jim Procter [Thu, 7 Sep 2017 13:17:07 +0000 (14:17 +0100)]
JAL-2511 release notes for 2.10.2b1

6 years agoJAL-2511 invalidate scale panel holder on font change to update layout
gmungoc [Thu, 7 Sep 2017 10:06:34 +0000 (11:06 +0100)]
JAL-2511 invalidate scale panel holder on font change to update layout

6 years agoJAL-2511 invalidate scale panel holder on font change to update layout bug/JAL-2511idAlignment
gmungoc [Thu, 7 Sep 2017 10:06:34 +0000 (11:06 +0100)]
JAL-2511 invalidate scale panel holder on font change to update layout

6 years agoJAL-2675 update release date to 7th Sept
Jim Procter [Thu, 7 Sep 2017 06:36:22 +0000 (07:36 +0100)]
JAL-2675 update release date to 7th Sept

6 years agoJAL-2675 update release date to 7th Sept
Jim Procter [Thu, 7 Sep 2017 06:36:22 +0000 (07:36 +0100)]
JAL-2675 update release date to 7th Sept

6 years agoJAL-2587 makes sure idWidthAdjuster is resized when container panel’s preference...
Jim Procter [Wed, 6 Sep 2017 21:03:40 +0000 (22:03 +0100)]
JAL-2587 makes sure idWidthAdjuster is resized when container panel’s preference changes

6 years agoJAL-2587 makes sure idWidthAdjuster is resized when container panel’s preference...
Jim Procter [Wed, 6 Sep 2017 21:03:40 +0000 (22:03 +0100)]
JAL-2587 makes sure idWidthAdjuster is resized when container panel’s preference changes

6 years agoJAL-2721 no fastPaint if img has been nulled by fontChanged!
gmungoc [Wed, 6 Sep 2017 15:03:47 +0000 (16:03 +0100)]
JAL-2721 no fastPaint if img has been nulled by fontChanged!

6 years agoJAL-2721 no fastPaint if img has been nulled by fontChanged! bug/JAL-2721fastPaintNPE
gmungoc [Wed, 6 Sep 2017 15:03:47 +0000 (16:03 +0100)]
JAL-2721 no fastPaint if img has been nulled by fontChanged!

6 years agoMerge branch 'feature/JAL-2587' into releases/Release_2_10_2b1_Branch
Jim Procter [Wed, 6 Sep 2017 11:12:07 +0000 (12:12 +0100)]
Merge branch 'feature/JAL-2587' into releases/Release_2_10_2b1_Branch

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch' into portforward/JAL-2675_2102b1to2103
Jim Procter [Wed, 6 Sep 2017 11:01:48 +0000 (12:01 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch' into portforward/JAL-2675_2102b1to2103

6 years agoJAL-2675 update release date to 6th September 2017
Jim Procter [Wed, 6 Sep 2017 10:58:49 +0000 (11:58 +0100)]
JAL-2675 update release date to 6th September 2017

6 years agoMerge JAL-2724 branch 'bug/JAL_2724_annotationcolourongroups' into releases/Release_2...
Jim Procter [Wed, 6 Sep 2017 10:57:17 +0000 (11:57 +0100)]
Merge JAL-2724 branch 'bug/JAL_2724_annotationcolourongroups' into releases/Release_2_10_2b1_Branch