jalview.git
6 years agoJAL-1766 additional tests for stub htsjdk wrapper
gmungoc [Thu, 30 Nov 2017 15:19:40 +0000 (15:19 +0000)]
JAL-1766 additional tests for stub htsjdk wrapper

6 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Tue, 28 Nov 2017 10:25:22 +0000 (10:25 +0000)]
Merge branch 'develop' into features/JAL-1793VCF

6 years agoJAL-2850 MapList.isToForwardStrand added
gmungoc [Tue, 28 Nov 2017 09:07:51 +0000 (09:07 +0000)]
JAL-2850 MapList.isToForwardStrand added

6 years agoJAL-2851 JAL-2858 release notes for 2.10.3b1
Jim Procter [Mon, 27 Nov 2017 18:46:19 +0000 (18:46 +0000)]
JAL-2851 JAL-2858 release notes for 2.10.3b1

6 years agoMerge branch 'bug/JAL-2851' into develop
Jim Procter [Mon, 27 Nov 2017 17:18:43 +0000 (17:18 +0000)]
Merge branch 'bug/JAL-2851' into develop

6 years agoJAL-2850 VCFLoader refactored to load VCF to contig sequences
gmungoc [Mon, 27 Nov 2017 15:21:33 +0000 (15:21 +0000)]
JAL-2850 VCFLoader refactored to load VCF to contig sequences

6 years agoJAL-2808 refactoring to better handler filter by Score or Label etc
gmungoc [Fri, 24 Nov 2017 14:46:42 +0000 (14:46 +0000)]
JAL-2808 refactoring to better handler filter by Score or Label etc

6 years agoJAL-2808 relocate constants for compiler, add COLUMN_COUNT constant
gmungoc [Fri, 24 Nov 2017 14:42:08 +0000 (14:42 +0000)]
JAL-2808 relocate constants for compiler, add COLUMN_COUNT constant

6 years agoJAL-2808 refine FeatureMatcher interface and matcher toString methods
gmungoc [Fri, 24 Nov 2017 14:40:21 +0000 (14:40 +0000)]
JAL-2808 refine FeatureMatcher interface and matcher toString methods

6 years agoJAL-2808 don't cache i18n - MessageManager already does that
gmungoc [Fri, 24 Nov 2017 14:38:17 +0000 (14:38 +0000)]
JAL-2808 don't cache i18n - MessageManager already does that

7 years agoJAL-2808 refactor KeyedMatcher as FeatureMatcher with byLabel, byScore, byAttribute...
gmungoc [Thu, 23 Nov 2017 16:20:03 +0000 (16:20 +0000)]
JAL-2808 refactor KeyedMatcher as FeatureMatcher with byLabel, byScore, byAttribute factory methods

7 years agoJAL-2808 removed field filters; sort CSQ data by key
gmungoc [Thu, 23 Nov 2017 12:51:15 +0000 (12:51 +0000)]
JAL-2808 removed field filters; sort CSQ data by key

7 years agoJAL-2808 added conditions Present, NotPresent as options
gmungoc [Thu, 23 Nov 2017 12:50:43 +0000 (12:50 +0000)]
JAL-2808 added conditions Present, NotPresent as options

7 years agoMerge branch 'develop' into bug/JAL-2851 bug/JAL-2851
kiramt [Thu, 23 Nov 2017 11:52:01 +0000 (11:52 +0000)]
Merge branch 'develop' into bug/JAL-2851

7 years agoJAL-2851 Fix merge error breaking vertical scrolling
kiramt [Thu, 23 Nov 2017 11:50:39 +0000 (11:50 +0000)]
JAL-2851 Fix merge error breaking vertical scrolling

7 years agoJAL-2808 refactor conversion of table data to beans for controller
gmungoc [Thu, 23 Nov 2017 10:38:20 +0000 (10:38 +0000)]
JAL-2808 refactor conversion of table data to beans for controller

7 years agoJAL-2808 pass FeatureSettings to controller as array of data bean
gmungoc [Thu, 23 Nov 2017 10:05:32 +0000 (10:05 +0000)]
JAL-2808 pass FeatureSettings to controller as array of data bean

7 years agoJAL-2808 update conditions list on change of attribute (safely)
gmungoc [Wed, 22 Nov 2017 16:56:35 +0000 (16:56 +0000)]
JAL-2808 update conditions list on change of attribute (safely)

7 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Wed, 22 Nov 2017 15:33:17 +0000 (15:33 +0000)]
Merge branch 'develop' into features/JAL-1793VCF

7 years agoJAL-2808 JAL-2069 FeatureTypeSettings (with new Filters tab) replaces FeatureColourCh...
gmungoc [Wed, 22 Nov 2017 15:24:52 +0000 (15:24 +0000)]
JAL-2808 JAL-2069 FeatureTypeSettings (with new Filters tab) replaces FeatureColourChooser (not applet)

7 years agoJAL-2069 renamed helper method better
gmungoc [Wed, 22 Nov 2017 12:29:47 +0000 (12:29 +0000)]
JAL-2069 renamed helper method better

7 years agoJAL-2808 defer dispose to allow screen location to be captured
gmungoc [Wed, 22 Nov 2017 12:27:33 +0000 (12:27 +0000)]
JAL-2808 defer dispose to allow screen location to be captured

7 years agoJAL-2069 Javadoc added only
gmungoc [Wed, 22 Nov 2017 12:26:19 +0000 (12:26 +0000)]
JAL-2069 Javadoc added only

7 years agoJAL-1424 enhanced to report dynamic keys separately
gmungoc [Wed, 22 Nov 2017 12:25:13 +0000 (12:25 +0000)]
JAL-1424 enhanced to report dynamic keys separately

7 years agoJAL-2808 capture feature attributes datatype (Character/Number/Mixed) for more intell...
gmungoc [Wed, 22 Nov 2017 09:34:58 +0000 (09:34 +0000)]
JAL-2808 capture feature attributes datatype (Character/Number/Mixed) for more intelligent filter conditions

7 years agoJAL-2698 only allow InstallAnywhere launches with version 1.8.* of java - java 9...
Jim Procter [Mon, 20 Nov 2017 16:17:26 +0000 (16:17 +0000)]
JAL-2698 only allow InstallAnywhere launches with version 1.8.* of java - java 9 JVM args not yet working for 2.10.3

7 years agoJAL-2698 patch path for InstallAnywhere build. Webstart and source builds unchanged
Jim Procter [Mon, 20 Nov 2017 14:44:16 +0000 (14:44 +0000)]
JAL-2698 patch path for InstallAnywhere build. Webstart and source builds unchanged

7 years agoJAL-2698 tidy release notes and whats new
Jim Procter [Fri, 17 Nov 2017 21:29:19 +0000 (21:29 +0000)]
JAL-2698 tidy release notes and whats new

7 years agoJAL-2698 source code licencing
Jim Procter [Fri, 17 Nov 2017 15:13:58 +0000 (15:13 +0000)]
JAL-2698 source code licencing

7 years agoJAL-2698 tidy up release notes
Jim Procter [Fri, 17 Nov 2017 14:56:24 +0000 (14:56 +0000)]
JAL-2698 tidy up release notes

7 years agoJAL-2698 Cached PDB Entries -> Cached Structures in UI and help doc
Jim Procter [Fri, 17 Nov 2017 14:40:37 +0000 (14:40 +0000)]
JAL-2698 Cached PDB Entries -> Cached Structures in UI and help doc

7 years agoJAL-2466 revised help text for sort by PID
Jim Procter [Fri, 17 Nov 2017 13:52:03 +0000 (13:52 +0000)]
JAL-2466 revised help text for sort by PID

7 years agoJAL-2698 what’s new and release notes
Jim Procter [Fri, 17 Nov 2017 13:51:25 +0000 (13:51 +0000)]
JAL-2698 what’s new and release notes

7 years agoJAL-2822 known defect for 2.10.3
Jim Procter [Fri, 17 Nov 2017 13:24:33 +0000 (13:24 +0000)]
JAL-2822 known defect for 2.10.3

7 years agoMerge branch 'bug/JAL-2784' into develop
Jim Procter [Fri, 17 Nov 2017 13:16:10 +0000 (13:16 +0000)]
Merge branch 'bug/JAL-2784' into develop

7 years agoJAL-2841 JAL-2791 new known defect


Jim Procter [Fri, 17 Nov 2017 13:15:20 +0000 (13:15 +0000)]
JAL-2841 JAL-2791 new known defect



7 years agoJAL-2541 known defect
Jim Procter [Fri, 17 Nov 2017 13:08:56 +0000 (13:08 +0000)]
JAL-2541 known defect

7 years agoJAL-2684 clarify release notes
Jim Procter [Fri, 17 Nov 2017 13:03:05 +0000 (13:03 +0000)]
JAL-2684 clarify release notes

7 years agoMerge branch 'bug/JAL-2821' into develop
Jim Procter [Fri, 17 Nov 2017 12:31:58 +0000 (12:31 +0000)]
Merge branch 'bug/JAL-2821' into develop

7 years agoJAL-2840 release notes
Jim Procter [Fri, 17 Nov 2017 12:26:42 +0000 (12:26 +0000)]
JAL-2840 release notes

7 years agoMerge branch 'bug/JAL-2837' into develop
Jim Procter [Fri, 17 Nov 2017 12:21:17 +0000 (12:21 +0000)]
Merge branch 'bug/JAL-2837' into develop

7 years agoMerge branch 'develop' into bug/JAL-2837 bug/JAL-2837
kiramt [Fri, 17 Nov 2017 12:14:59 +0000 (12:14 +0000)]
Merge branch 'develop' into bug/JAL-2837

Conflicts:
src/jalview/gui/SeqPanel.java

7 years agoMerge branch 'doc/JAL-2494_JAL-2828_mergefindAnnotation' into develop
Jim Procter [Fri, 17 Nov 2017 12:14:21 +0000 (12:14 +0000)]
Merge branch 'doc/JAL-2494_JAL-2828_mergefindAnnotation' into develop

7 years agoMerge branch 'develop' into bug/JAL-2837
kiramt [Fri, 17 Nov 2017 12:09:20 +0000 (12:09 +0000)]
Merge branch 'develop' into bug/JAL-2837

7 years agoJAL-2811 release note
Jim Procter [Fri, 17 Nov 2017 11:56:59 +0000 (11:56 +0000)]
JAL-2811 release note

7 years agoJAL-2541 not in 2.10.3, JAL-2831 signed off.
Jim Procter [Fri, 17 Nov 2017 11:47:51 +0000 (11:47 +0000)]
JAL-2541 not in 2.10.3, JAL-2831 signed off.

7 years agoJAL-2698 11th hour release today
Jim Procter [Fri, 17 Nov 2017 11:47:25 +0000 (11:47 +0000)]
JAL-2698 11th hour release today

7 years agoMerge branch 'bug/JAL-2831' into develop
Jim Procter [Fri, 17 Nov 2017 11:28:43 +0000 (11:28 +0000)]
Merge branch 'bug/JAL-2831' into develop

7 years agoJAL-2808 set (read-only) condition text field as disabled
gmungoc [Fri, 17 Nov 2017 09:49:04 +0000 (09:49 +0000)]
JAL-2808 set (read-only) condition text field as disabled

7 years agoJAL-2541 JAL-2829 JAL-2830 JAL-2822 catch all release note entry for sequence feature...
Jim Procter [Thu, 16 Nov 2017 16:50:03 +0000 (16:50 +0000)]
JAL-2541 JAL-2829 JAL-2830 JAL-2822 catch all release note entry for sequence feature relocation

7 years agoMerge branch 'bug/JAL-2829deleteCharsWithGaps' into develop
Jim Procter [Thu, 16 Nov 2017 16:45:35 +0000 (16:45 +0000)]
Merge branch 'bug/JAL-2829deleteCharsWithGaps' into develop

7 years agoJAL-2069 fix minor bugs in variable setting
gmungoc [Thu, 16 Nov 2017 14:23:00 +0000 (14:23 +0000)]
JAL-2069 fix minor bugs in variable setting

7 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Thu, 16 Nov 2017 12:20:04 +0000 (12:20 +0000)]
Merge branch 'develop' into features/JAL-1793VCF

7 years agoJAL-2831 Removed unwanted hidden sequences checks bug/JAL-2831
kiramt [Thu, 16 Nov 2017 11:57:15 +0000 (11:57 +0000)]
JAL-2831 Removed unwanted hidden sequences checks

7 years agoJAL-2069 removed unused and redundant thresholdIsMinMax
gmungoc [Thu, 16 Nov 2017 09:15:21 +0000 (09:15 +0000)]
JAL-2069 removed unused and redundant thresholdIsMinMax

7 years agoJAL-2816 JAL-2835 additional tests to include colour/filter by attribute
gmungoc [Thu, 16 Nov 2017 09:13:00 +0000 (09:13 +0000)]
JAL-2816 JAL-2835 additional tests to include colour/filter by attribute

7 years agoJAL-2835 update test for array-valued attribute name
gmungoc [Thu, 16 Nov 2017 09:05:03 +0000 (09:05 +0000)]
JAL-2835 update test for array-valued attribute name

7 years agoJAL-2835 update test for CSQ data held as a Map
gmungoc [Thu, 16 Nov 2017 09:03:49 +0000 (09:03 +0000)]
JAL-2835 update test for CSQ data held as a Map

7 years agoJAL-2835 test updated for colour by 'nested attribute'
gmungoc [Thu, 16 Nov 2017 08:18:10 +0000 (08:18 +0000)]
JAL-2835 test updated for colour by 'nested attribute'

7 years agoJAL-2816 tests for findFeaturesAtColumn
gmungoc [Thu, 16 Nov 2017 08:13:52 +0000 (08:13 +0000)]
JAL-2816 tests for findFeaturesAtColumn

7 years agoJAL-2831 Don't show cursor if position in hidden region
kiramt [Wed, 15 Nov 2017 16:22:21 +0000 (16:22 +0000)]
JAL-2831 Don't show cursor if position in hidden region

7 years agoMerge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Wed, 15 Nov 2017 16:05:18 +0000 (16:05 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831

7 years agoJAL-2816 exclude filtered / thresholded out features when finding
gmungoc [Wed, 15 Nov 2017 15:47:41 +0000 (15:47 +0000)]
JAL-2816 exclude filtered / thresholded out features when finding

7 years agoJAL-2811 Updated following review bug/JAL-2811
kiramt [Wed, 15 Nov 2017 13:23:00 +0000 (13:23 +0000)]
JAL-2811 Updated following review

7 years agoJAL-2840 fix wrapped scrolling when using cursor at a hidden region
kiramt [Wed, 15 Nov 2017 11:44:44 +0000 (11:44 +0000)]
JAL-2840 fix wrapped scrolling when using cursor at a hidden region

7 years agoJAL-2834 JAL-2836 temporarily disabled wrapped mode fastpaint
kiramt [Wed, 15 Nov 2017 11:17:41 +0000 (11:17 +0000)]
JAL-2834 JAL-2836 temporarily disabled wrapped mode fastpaint

7 years agoJAL-2835 take all CSQ fields; catch invalid field match patterns
gmungoc [Wed, 15 Nov 2017 10:50:19 +0000 (10:50 +0000)]
JAL-2835 take all CSQ fields; catch invalid field match patterns

7 years agoJAL-2835 support filter/colour by nested attribute names
gmungoc [Wed, 15 Nov 2017 10:42:49 +0000 (10:42 +0000)]
JAL-2835 support filter/colour by nested attribute names

7 years agoJAL-2835 code tidy (generic type constructors)
gmungoc [Wed, 15 Nov 2017 10:41:45 +0000 (10:41 +0000)]
JAL-2835 code tidy (generic type constructors)

7 years agoJAL-2069 dialog title now 'Variable colour'
gmungoc [Wed, 15 Nov 2017 10:38:21 +0000 (10:38 +0000)]
JAL-2069 dialog title now 'Variable colour'

7 years agoJAL- 2835 support filter on nested attribute keys
gmungoc [Wed, 15 Nov 2017 10:36:23 +0000 (10:36 +0000)]
JAL- 2835 support filter on nested attribute keys

7 years agoJAL-2835 add filters for VCF/VEP 'fields of interest'
gmungoc [Wed, 15 Nov 2017 10:34:28 +0000 (10:34 +0000)]
JAL-2835 add filters for VCF/VEP 'fields of interest'

7 years agoJAL-1270 add missing "Functional" to tests
gmungoc [Wed, 15 Nov 2017 10:32:41 +0000 (10:32 +0000)]
JAL-1270 add missing "Functional" to tests

7 years agoJAL-2831 ported to applet
kiramt [Wed, 15 Nov 2017 08:47:47 +0000 (08:47 +0000)]
JAL-2831 ported to applet

7 years agoJAL-2831 tidies and tests
kiramt [Tue, 14 Nov 2017 19:36:53 +0000 (19:36 +0000)]
JAL-2831 tidies and tests

7 years agoJAL-2831 tidy
kiramt [Tue, 14 Nov 2017 16:03:47 +0000 (16:03 +0000)]
JAL-2831 tidy

7 years agoMerge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Tue, 14 Nov 2017 14:59:52 +0000 (14:59 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831

7 years agoJAL-2811 Changed to overlay on via graphics context, not separate image
kiramt [Tue, 14 Nov 2017 14:56:37 +0000 (14:56 +0000)]
JAL-2811 Changed to overlay on via graphics context, not separate image

7 years agoJAL-2811 Missed commit
kiramt [Tue, 14 Nov 2017 14:10:30 +0000 (14:10 +0000)]
JAL-2811 Missed commit

7 years agoJAL-2811 Made it work for hidden columns/seqs too
kiramt [Tue, 14 Nov 2017 13:43:40 +0000 (13:43 +0000)]
JAL-2811 Made it work for hidden columns/seqs too

7 years agoJAL-2831 Attempt at cursor fix for wrapped mode
kiramt [Tue, 14 Nov 2017 12:11:21 +0000 (12:11 +0000)]
JAL-2831 Attempt at cursor fix for wrapped mode

7 years agoJAL-2758 update uniprot retrieval test
Jim Procter [Tue, 14 Nov 2017 12:11:04 +0000 (12:11 +0000)]
JAL-2758 update uniprot retrieval test

7 years agoMerge branch 'bug/JAL-2811' into bug/JAL-2831
kiramt [Tue, 14 Nov 2017 11:12:55 +0000 (11:12 +0000)]
Merge branch 'bug/JAL-2811' into bug/JAL-2831

7 years agoJAL-2831 deal with hidden cols and seqs in new cursor code
kiramt [Tue, 14 Nov 2017 10:33:33 +0000 (10:33 +0000)]
JAL-2831 deal with hidden cols and seqs in new cursor code

7 years agoJAL-2831 Added move viewport event and set up cursor code to use it
kiramt [Tue, 14 Nov 2017 10:15:46 +0000 (10:15 +0000)]
JAL-2831 Added move viewport event and set up cursor code to use it

7 years agoMerge branch 'imp/JAL-2774' into bug/JAL-2831
kiramt [Tue, 14 Nov 2017 09:30:31 +0000 (09:30 +0000)]
Merge branch 'imp/JAL-2774' into bug/JAL-2831

7 years agoJAL-2754 corrected merge conflict
gmungoc [Tue, 14 Nov 2017 08:44:08 +0000 (08:44 +0000)]
JAL-2754 corrected merge conflict

7 years agoJAL-2758 release notes
Jim Procter [Mon, 13 Nov 2017 20:25:06 +0000 (20:25 +0000)]
JAL-2758 release notes

7 years agoJAL-2698 formatting
Jim Procter [Mon, 13 Nov 2017 20:22:01 +0000 (20:22 +0000)]
JAL-2698 formatting

7 years agoJAL-2811 Tidy
kiramt [Mon, 13 Nov 2017 19:40:06 +0000 (19:40 +0000)]
JAL-2811 Tidy

7 years agoMerge branch 'features/JAL-2758_shorteruniprot' into develop
Jim Procter [Mon, 13 Nov 2017 18:59:59 +0000 (18:59 +0000)]
Merge branch 'features/JAL-2758_shorteruniprot' into develop

7 years agoJAL-2758 remove configurable behaviour - Uniprot sequences are only assigned IDs...
Jim Procter [Mon, 13 Nov 2017 18:57:10 +0000 (18:57 +0000)]
JAL-2758 remove configurable behaviour - Uniprot sequences are only assigned IDs derived from Entry name

7 years agoJAL-2758 typo
Jim Procter [Mon, 13 Nov 2017 18:56:22 +0000 (18:56 +0000)]
JAL-2758 typo

7 years agoJAL-2738 stubs for filtering VEP and VCF fields of interest
gmungoc [Mon, 13 Nov 2017 16:57:02 +0000 (16:57 +0000)]
JAL-2738 stubs for filtering VEP and VCF fields of interest

7 years agoJAl-2811 Working for wrapped panels too
kiramt [Mon, 13 Nov 2017 16:42:20 +0000 (16:42 +0000)]
JAl-2811 Working for wrapped panels too

7 years agoMerge branch 'develop' into features/JAL-1793VCF
gmungoc [Mon, 13 Nov 2017 16:39:02 +0000 (16:39 +0000)]
Merge branch 'develop' into features/JAL-1793VCF

Conflicts:
.classpath
build.xml
resources/lang/Messages.properties

7 years agoJAL-2662 tweak README, format code
gmungoc [Mon, 13 Nov 2017 16:23:12 +0000 (16:23 +0000)]
JAL-2662 tweak README, format code

7 years agoJAL-2698 what's new...
Jim Procter [Mon, 13 Nov 2017 16:05:37 +0000 (16:05 +0000)]
JAL-2698 what's new...

7 years agoJAL-2811 Add layer for cursor in SeqCanvas
kiramt [Mon, 13 Nov 2017 15:53:12 +0000 (15:53 +0000)]
JAL-2811 Add layer for cursor in SeqCanvas

7 years agoJAL-2810 release notes
Jim Procter [Mon, 13 Nov 2017 15:41:10 +0000 (15:41 +0000)]
JAL-2810 release notes