jalview.git
6 years agoJAL-2805 code refactor (actionPerformed cleaned up) & moved tree loading
kjvdheide [Fri, 17 Nov 2017 15:48:51 +0000 (15:48 +0000)]
JAL-2805 code refactor (actionPerformed cleaned up) & moved tree loading

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

6 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

6 years agoJAL-2805 reorganized code, tree building goes through AptxInit for now
kjvdheide [Fri, 17 Nov 2017 14:44:46 +0000 (14:44 +0000)]
JAL-2805 reorganized code, tree building goes through AptxInit for now

6 years agoJAL-2795 removed unneeded distancematrix length/width check
kjvdheide [Fri, 17 Nov 2017 14:43:11 +0000 (14:43 +0000)]
JAL-2795 removed unneeded distancematrix length/width check

6 years agoJAL-2844 changed Aptx config to make all cladogram branches aligned
kjvdheide [Fri, 17 Nov 2017 14:41:40 +0000 (14:41 +0000)]
JAL-2844 changed Aptx config to make all cladogram branches aligned

6 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

6 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

6 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

6 years agoMerge branch 'kjvdh/features/PhylogenyViewer' of
kjvdheide [Fri, 17 Nov 2017 13:34:22 +0000 (13:34 +0000)]
Merge branch 'kjvdh/features/PhylogenyViewer' of
https://source.jalview.org/git/jalview.git into
kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/ext/archaeopteryx/AptxBinding.java
src/jalview/ext/forester/io/ExternalTreeParserI.java
src/jalview/ext/forester/io/ForesterTreeParser.java

6 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

6 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

6 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



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

6 years agoJAL-2805 couple of method name changes
kjvdheide [Fri, 17 Nov 2017 13:07:27 +0000 (13:07 +0000)]
JAL-2805 couple of method name changes

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

6 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

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

6 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

6 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

6 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

6 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

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

6 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.

6 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

6 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

6 years agoJAL-281 added menu items and listeners to load from URL/Db
kjvdheide [Fri, 17 Nov 2017 02:24:58 +0000 (02:24 +0000)]
JAL-281 added menu items and listeners to load from URL/Db

6 years agoJAL-281 changed load associated tree GUI item to menu selection
kjvdheide [Fri, 17 Nov 2017 01:49:47 +0000 (01:49 +0000)]
JAL-281 changed load associated tree GUI item to menu selection

6 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

6 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

6 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

6 years agoJAL-2805 expanded tree and treenode interfaces
kjvdheide [Thu, 16 Nov 2017 11:38:47 +0000 (11:38 +0000)]
JAL-2805 expanded tree and treenode interfaces

6 years agoJAL-2805 loads of file reorganizing, interfaces expanded
kjvdheide [Thu, 16 Nov 2017 11:30:08 +0000 (11:30 +0000)]
JAL-2805 loads of file reorganizing, interfaces expanded

6 years agoJAL-2842 remove infinite loop in cursor move bug/JAL-2842
kiramt [Thu, 16 Nov 2017 09:12:06 +0000 (09:12 +0000)]
JAL-2842 remove infinite loop in cursor move

6 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

6 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

6 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

6 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

6 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

6 years agoJAL-2805 functional binding on loading associated trees
kjvdheide [Wed, 15 Nov 2017 10:39:47 +0000 (10:39 +0000)]
JAL-2805 functional binding on loading associated trees

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

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

6 years agoJAL-2805 viewport is passed along to the tree parser
kjvdheide [Tue, 14 Nov 2017 17:17:50 +0000 (17:17 +0000)]
JAL-2805 viewport is passed along to the tree parser

6 years agoJAL-2795 added duplication check when calculated nodes are bound to seqs
kjvdheide [Tue, 14 Nov 2017 17:17:04 +0000 (17:17 +0000)]
JAL-2795 added duplication check when calculated nodes are bound to seqs

6 years agoJAL-2805 added getters for hashmaps filled with associated seqs/nodes
kjvdheide [Tue, 14 Nov 2017 17:15:54 +0000 (17:15 +0000)]
JAL-2805 added getters for hashmaps filled with associated seqs/nodes

6 years agoJAL-2805 added static method for logging duplications when using map.put
kjvdheide [Tue, 14 Nov 2017 16:57:36 +0000 (16:57 +0000)]
JAL-2805 added static method for logging duplications when using map.put

6 years agoJAL-2805 more sensible interface method params
kjvdheide [Tue, 14 Nov 2017 16:56:50 +0000 (16:56 +0000)]
JAL-2805 more sensible interface method params

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

6 years agoJAL-2805 finished up interface comments
kjvdheide [Tue, 14 Nov 2017 16:00:29 +0000 (16:00 +0000)]
JAL-2805 finished up interface comments

6 years agoJAL-2805 re-enabled one2many checks
kjvdheide [Tue, 14 Nov 2017 15:31:49 +0000 (15:31 +0000)]
JAL-2805 re-enabled one2many checks

6 years agoJAL-2805 interface comments, progress on associating leaves
kjvdheide [Tue, 14 Nov 2017 15:28:56 +0000 (15:28 +0000)]
JAL-2805 interface comments, progress on associating leaves

6 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

6 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

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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

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

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

6 years agoJAL-2805 interface comments
kjvdheide [Mon, 13 Nov 2017 20:19:43 +0000 (20:19 +0000)]
JAL-2805 interface comments

6 years agoJAL-2805 some more name changes
kjvdheide [Mon, 13 Nov 2017 20:07:06 +0000 (20:07 +0000)]
JAL-2805 some more name changes

6 years agoJAL-2805 more name changes for clarity
kjvdheide [Mon, 13 Nov 2017 20:03:31 +0000 (20:03 +0000)]
JAL-2805 more name changes for clarity

6 years agoJAL-2805 more interface name changing
kjvdheide [Mon, 13 Nov 2017 19:56:05 +0000 (19:56 +0000)]
JAL-2805 more interface name changing

6 years agoJAL-2805 name changed of interfaces for consistency
kjvdheide [Mon, 13 Nov 2017 19:55:14 +0000 (19:55 +0000)]
JAL-2805 name changed of interfaces for consistency

6 years agoJAL-2805 Jalview sequence binding interface expanded
kjvdheide [Mon, 13 Nov 2017 19:47:19 +0000 (19:47 +0000)]
JAL-2805 Jalview sequence binding interface expanded

6 years agoJAL-2805 TreeParser now interface based
kjvdheide [Mon, 13 Nov 2017 19:46:17 +0000 (19:46 +0000)]
JAL-2805 TreeParser now interface based

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

6 years agoJAL-2805 Added tree building interface
kjvdheide [Mon, 13 Nov 2017 19:34:25 +0000 (19:34 +0000)]
JAL-2805 Added tree building interface

6 years agoJAL-2805 name change
kjvdheide [Mon, 13 Nov 2017 19:22:02 +0000 (19:22 +0000)]
JAL-2805 name change

6 years agoJAL-2805 deleted old Aptx class for loading just Newick files
kjvdheide [Mon, 13 Nov 2017 19:19:10 +0000 (19:19 +0000)]
JAL-2805 deleted old Aptx class for loading just Newick files

6 years agoJAL-2805 more interface work
kjvdheide [Mon, 13 Nov 2017 19:16:43 +0000 (19:16 +0000)]
JAL-2805 more interface work

6 years agoJAL-2794 removed unused interface
kjvdheide [Mon, 13 Nov 2017 19:03:58 +0000 (19:03 +0000)]
JAL-2794 removed unused interface

6 years agoJAL-2805 undid accidental double (buggy) binding, more interface support
kjvdheide [Mon, 13 Nov 2017 19:02:16 +0000 (19:02 +0000)]
JAL-2805 undid accidental double (buggy) binding, more interface support

6 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

6 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

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

6 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

6 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

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

6 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

6 years agoJAL-2805 warning messages added if Forester detects file loading issues
kjvdheide [Mon, 13 Nov 2017 15:43:56 +0000 (15:43 +0000)]
JAL-2805 warning messages added if Forester detects file loading issues

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

6 years agoMerge branch 'imp/JAL-2810_ftsIDtab' into develop
Jim Procter [Mon, 13 Nov 2017 15:38:34 +0000 (15:38 +0000)]
Merge branch 'imp/JAL-2810_ftsIDtab' into develop

6 years agoJAL-2805 First try at loading tree through Forester by calling Aptx main
kjvdheide [Mon, 13 Nov 2017 14:22:27 +0000 (14:22 +0000)]
JAL-2805 First try at loading tree through Forester by calling Aptx main

Added file filters for Forester supported tree formats to the file
chooser window and Forester tree parser in the ActionPerformed of
loading an associated tree, also see Forester commits for more details

6 years agoJAL-2698 stub for 2.10.3 new known issues entries
Jim Procter [Mon, 13 Nov 2017 15:32:05 +0000 (15:32 +0000)]
JAL-2698 stub for 2.10.3 new known issues entries

6 years agoJAL-2702 groovy interpreter update and java 9 jnlp release notes
Jim Procter [Mon, 13 Nov 2017 15:31:05 +0000 (15:31 +0000)]
JAL-2702 groovy interpreter update and java 9 jnlp release notes

6 years agoMerge branch 'bug/JAL-2702_groovyconsoleJava9' into develop
Jim Procter [Mon, 13 Nov 2017 15:03:27 +0000 (15:03 +0000)]
Merge branch 'bug/JAL-2702_groovyconsoleJava9' into develop

6 years agoJAL-2702 --illegal-access=warn for JVM launch
Jim Procter [Mon, 13 Nov 2017 14:33:06 +0000 (14:33 +0000)]
JAL-2702 --illegal-access=warn for JVM launch

6 years agoJAL-2176 removed unused Sequence.index
gmungoc [Mon, 13 Nov 2017 14:11:08 +0000 (14:11 +0000)]
JAL-2176 removed unused Sequence.index

6 years agoJAL-2702 update to groovy 2.4.12
Jim Procter [Mon, 13 Nov 2017 13:52:48 +0000 (13:52 +0000)]
JAL-2702 update to groovy 2.4.12

6 years agoJAL-2810 updated help docs for auto search checkbox and retrieve IDs tab
Jim Procter [Mon, 13 Nov 2017 13:00:17 +0000 (13:00 +0000)]
JAL-2810 updated help docs for auto search checkbox and retrieve IDs tab

6 years agoJAL-2784 new checks for gg==null bug/JAL-2784
kiramt [Mon, 13 Nov 2017 12:46:37 +0000 (12:46 +0000)]
JAL-2784 new checks for gg==null

6 years agoJAL-2810 updated screenshots in documentation
Jim Procter [Mon, 13 Nov 2017 12:44:08 +0000 (12:44 +0000)]
JAL-2810 updated screenshots in documentation

6 years agoJAL-2810 auto search checkbox state stored as user preference. Enabled by default.
Jim Procter [Mon, 13 Nov 2017 12:43:38 +0000 (12:43 +0000)]
JAL-2810 auto search checkbox state stored as user preference. Enabled by default.

6 years agoJAL-2679 example accession changed to CAD01290
gmungoc [Mon, 13 Nov 2017 12:02:43 +0000 (12:02 +0000)]
JAL-2679 example accession changed to CAD01290

6 years agoJAL-2810 mainFramTabs -> tabs
Jim Procter [Mon, 13 Nov 2017 11:53:27 +0000 (11:53 +0000)]
JAL-2810 mainFramTabs -> tabs