jalview.git
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

6 years agoJAL-2810 simpler tooltip (assume user will work out that pressing return will update...
Jim Procter [Mon, 13 Nov 2017 11:53:02 +0000 (11:53 +0000)]
JAL-2810 simpler tooltip (assume user will work out that pressing return will update results)

6 years agoJAL-2828 allow CalcId to match on String equivalence (migrated from Alignment’s imple... doc/JAL-2494_JAL-2828_mergefindAnnotation
Jim Procter [Fri, 10 Nov 2017 16:46:15 +0000 (16:46 +0000)]
JAL-2828 allow CalcId to match on String equivalence (migrated from Alignment’s implementation of findAnnotation)

6 years agoJAL-2828 refactored duplicate code for searching lists of AlignmentAnnotation to...
Jim Procter [Fri, 10 Nov 2017 16:37:35 +0000 (16:37 +0000)]
JAL-2828 refactored duplicate code for searching lists of AlignmentAnnotation to static methods.

6 years agoJAL-2829 fixes and unit tests bug/JAL-2829deleteCharsWithGaps
gmungoc [Fri, 10 Nov 2017 15:56:11 +0000 (15:56 +0000)]
JAL-2829 fixes and unit tests

6 years agoJAL-2562 updated findPosition javadoc to match behaviour
gmungoc [Fri, 10 Nov 2017 15:38:19 +0000 (15:38 +0000)]
JAL-2562 updated findPosition javadoc to match behaviour

6 years agoJAL-2794 reorganized node select code, added subtree selection support
kjvdheide [Fri, 10 Nov 2017 15:31:40 +0000 (15:31 +0000)]
JAL-2794 reorganized node select code, added subtree selection support

6 years agoJAL-2829 unit tests for failing cases
gmungoc [Fri, 10 Nov 2017 15:10:50 +0000 (15:10 +0000)]
JAL-2829 unit tests for failing cases

6 years agoJAL-2794 comments comments comments
kjvdheide [Fri, 10 Nov 2017 14:17:18 +0000 (14:17 +0000)]
JAL-2794 comments comments comments

6 years agoJAL-2794 most method parameters/class variables made final
kjvdheide [Fri, 10 Nov 2017 13:42:50 +0000 (13:42 +0000)]
JAL-2794 most method parameters/class variables made final

6 years agoJAL-2794 comments, selected node now doesn't have to be external per se
kjvdheide [Fri, 10 Nov 2017 13:38:33 +0000 (13:38 +0000)]
JAL-2794 comments, selected node now doesn't have to be external per se

6 years agoJAL-2794 PaintRefresher support, Aptx node selection now shown on align
kjvdheide [Thu, 9 Nov 2017 16:12:00 +0000 (16:12 +0000)]
JAL-2794 PaintRefresher support, Aptx node selection now shown on align

6 years agoJAL-2794 interface comment
kjvdheide [Thu, 9 Nov 2017 16:09:23 +0000 (16:09 +0000)]
JAL-2794 interface comment

6 years agoJAL-2794 Made HashMap with Nodes as keys and sequences as values as well
kjvdheide [Thu, 9 Nov 2017 16:08:46 +0000 (16:08 +0000)]
JAL-2794 Made HashMap with Nodes as keys and sequences as values as well

6 years agoJAL-2794 Aptx instances get their parent alignment, start on binding
kjvdheide [Wed, 8 Nov 2017 17:59:24 +0000 (17:59 +0000)]
JAL-2794 Aptx instances get their parent alignment, start on binding

Binding from Alignment to Aptx is now functional (including shift and/or
ctrl presses for multiple sequences), other way around is WIP

6 years agoJAL-2794 Cleaning up tree conversion, sequences are now in the tree
kjvdheide [Wed, 8 Nov 2017 17:53:17 +0000 (17:53 +0000)]
JAL-2794 Cleaning up tree conversion, sequences are now in the tree

6 years agoJAL-2794 getters and setters for finding nodes in forester made public
kjvdheide [Wed, 8 Nov 2017 17:50:02 +0000 (17:50 +0000)]
JAL-2794 getters and setters for finding nodes in forester made public

6 years agoJAL-2795 created static class for forester conversions
kjvdheide [Wed, 8 Nov 2017 17:46:52 +0000 (17:46 +0000)]
JAL-2795 created static class for forester conversions

6 years agoJAL-2794 Interface name change (oops)
kjvdheide [Wed, 8 Nov 2017 17:45:36 +0000 (17:45 +0000)]
JAL-2794 Interface name change (oops)

6 years agoJAL-2794 made JalviewTreeViewerBinding an interface
kjvdheide [Wed, 8 Nov 2017 17:44:54 +0000 (17:44 +0000)]
JAL-2794 made JalviewTreeViewerBinding an interface

6 years agoJAL-2794 Added getter for AlignmentViewport to TreeBuilder
kjvdheide [Wed, 8 Nov 2017 17:43:44 +0000 (17:43 +0000)]
JAL-2794 Added getter for AlignmentViewport to TreeBuilder

6 years agoMerge branch 'bug/JAL-2742' into develop
Jim Procter [Wed, 8 Nov 2017 17:02:42 +0000 (17:02 +0000)]
Merge branch 'bug/JAL-2742' into develop

6 years agoRevert "JAL-2742 release notes - pending confirmation that there was impact to user"
Jim Procter [Wed, 8 Nov 2017 17:02:06 +0000 (17:02 +0000)]
Revert "JAL-2742 release notes - pending confirmation that there was impact to user"
-- no impact so won't include development detail in release notes.

This reverts commit ba70dbddc08876d8d72bb303823f683b65bf13c7.

6 years agoJAL-2225 release note
Jim Procter [Wed, 8 Nov 2017 16:57:14 +0000 (16:57 +0000)]
JAL-2225 release note

6 years agoMerge branch 'bug/JAL-2225mapMultipleChains' into develop
Jim Procter [Wed, 8 Nov 2017 16:52:03 +0000 (16:52 +0000)]
Merge branch 'bug/JAL-2225mapMultipleChains' into develop

6 years agoMerge branch 'develop' into bug/JAL-2225mapMultipleChains
Jim Procter [Wed, 8 Nov 2017 15:21:13 +0000 (15:21 +0000)]
Merge branch 'develop' into bug/JAL-2225mapMultipleChains

6 years agoJAL-2698 14 Nov 2017 release date for 2.10.3
Jim Procter [Tue, 7 Nov 2017 17:33:07 +0000 (17:33 +0000)]
JAL-2698 14 Nov 2017 release date for 2.10.3

6 years agoJAL-2775 release notes
Jim Procter [Tue, 7 Nov 2017 17:27:46 +0000 (17:27 +0000)]
JAL-2775 release notes

6 years agoMerge branch 'imp/JAL-2775' into develop
Jim Procter [Tue, 7 Nov 2017 17:25:51 +0000 (17:25 +0000)]
Merge branch 'imp/JAL-2775' into develop

6 years agoJAL-2810 i18n tab label
Jim Procter [Tue, 7 Nov 2017 17:18:12 +0000 (17:18 +0000)]
JAL-2810 i18n tab label

6 years agoJAL-2774 Added javadoc for new event parameters imp/JAL-2774
kiramt [Tue, 7 Nov 2017 17:13:20 +0000 (17:13 +0000)]
JAL-2774 Added javadoc for new event parameters

6 years agoJAL-2810 ‘Close’ is now ‘Cancel’ in SequenceFetcher panel
Jim Procter [Tue, 7 Nov 2017 17:12:45 +0000 (17:12 +0000)]
JAL-2810 ‘Close’ is now ‘Cancel’ in SequenceFetcher panel

6 years agoJAL-2810 working back button shown for bulk ID retrieval tab in FTS search
Jim Procter [Tue, 7 Nov 2017 17:12:08 +0000 (17:12 +0000)]
JAL-2810 working back button shown for bulk ID retrieval tab in FTS search

6 years agoJAL-2774 Fix fastpaint of wrapped alignment
kiramt [Tue, 7 Nov 2017 17:09:30 +0000 (17:09 +0000)]
JAL-2774 Fix fastpaint of wrapped alignment

6 years agoJAL-2821 refactored drawPartialGroupOutline bug/JAL-2821
kiramt [Tue, 7 Nov 2017 17:02:31 +0000 (17:02 +0000)]
JAL-2821 refactored drawPartialGroupOutline

6 years agoJAL-2810 bulk fetch for PDB IDs
Jim Procter [Tue, 7 Nov 2017 16:37:34 +0000 (16:37 +0000)]
JAL-2810 bulk fetch for PDB IDs

6 years agoJAL-2804 clearer tooltip for autosearch checkbox
Jim Procter [Tue, 7 Nov 2017 16:30:26 +0000 (16:30 +0000)]
JAL-2804 clearer tooltip for autosearch checkbox

6 years agoJAL-2794 simplified/clarified associating leaves to sequences
kjvdheide [Mon, 6 Nov 2017 18:11:50 +0000 (18:11 +0000)]
JAL-2794 simplified/clarified associating leaves to sequences

6 years agoJAL-2756 release notes
Jim Procter [Mon, 6 Nov 2017 16:41:28 +0000 (16:41 +0000)]
JAL-2756 release notes

6 years agoMerge branch 'bug/JAL-2756sequenceidmessage' into develop
Jim Procter [Mon, 6 Nov 2017 16:34:05 +0000 (16:34 +0000)]
Merge branch 'bug/JAL-2756sequenceidmessage' into develop

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

6 years agoJAL-2818 modified README for launching jalview from source build
Jim Procter [Fri, 3 Nov 2017 15:56:12 +0000 (15:56 +0000)]
JAL-2818 modified README for launching jalview from source build

6 years agoJAL-2794 created tree viewer binding class
kjvdheide [Fri, 3 Nov 2017 09:25:23 +0000 (09:25 +0000)]
JAL-2794 created tree viewer binding class

6 years agoJAL-2795 bunch of cleanup and comments
kjvdheide [Fri, 3 Nov 2017 09:23:35 +0000 (09:23 +0000)]
JAL-2795 bunch of cleanup and comments

6 years agoJAL-2795 added back test loop for Aptx tree naming & initTreePanel
kjvdheide [Thu, 2 Nov 2017 17:58:05 +0000 (17:58 +0000)]
JAL-2795 added back test loop for Aptx tree naming & initTreePanel

6 years agoJAL-2795 Reverted code changes needed to cluster from Forester
kjvdheide [Thu, 2 Nov 2017 17:06:48 +0000 (17:06 +0000)]
JAL-2795 Reverted code changes needed to cluster from Forester

6 years agoJAL-2795 Forester now NJ-clusters the DistanceMatrix from Jalview
kjvdheide [Thu, 2 Nov 2017 16:58:50 +0000 (16:58 +0000)]
JAL-2795 Forester now NJ-clusters the DistanceMatrix from Jalview

6 years agoJAL-2795 moved matrix conversion to the ForesterMatrix class
kjvdheide [Thu, 2 Nov 2017 12:11:33 +0000 (12:11 +0000)]
JAL-2795 moved matrix conversion to the ForesterMatrix class

6 years agoJAL-2795 Sequence[] references now as SequenceI[] & deleted double class
kjvdheide [Wed, 1 Nov 2017 16:13:18 +0000 (16:13 +0000)]
JAL-2795 Sequence[] references now as SequenceI[] & deleted double class

6 years agoJAL-2795 removed sequences[] class variable, more comments
kjvdheide [Wed, 1 Nov 2017 15:54:14 +0000 (15:54 +0000)]
JAL-2795 removed sequences[] class variable, more comments

6 years agoMerge branch 'develop' into imp/JAL-2775 imp/JAL-2775
kiramt [Wed, 1 Nov 2017 11:21:47 +0000 (11:21 +0000)]
Merge branch 'develop' into imp/JAL-2775

6 years agoJAL-2774 Fix repaint artefacts
kiramt [Tue, 31 Oct 2017 15:05:01 +0000 (15:05 +0000)]
JAL-2774 Fix repaint artefacts

6 years agoJAL-2774 Fixed merge issues
kiramt [Tue, 31 Oct 2017 14:24:54 +0000 (14:24 +0000)]
JAL-2774 Fixed merge issues

6 years agoMerge remote-tracking branch 'origin/develop' into imp/JAL-2774
kiramt [Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)]
Merge remote-tracking branch 'origin/develop' into imp/JAL-2774

Conflicts:
src/jalview/gui/SeqCanvas.java

6 years agoJAL-2810 checkbox label for Autosearch
Jim Procter [Tue, 31 Oct 2017 11:03:16 +0000 (11:03 +0000)]
JAL-2810 checkbox label for Autosearch

6 years agoJAL-2810 default border colour
Jim Procter [Tue, 31 Oct 2017 11:00:55 +0000 (11:00 +0000)]
JAL-2810 default border colour

6 years agoJAL-2756 update for new EBI https link
kiramt [Tue, 31 Oct 2017 10:00:52 +0000 (10:00 +0000)]
JAL-2756 update for new EBI https link

6 years agoJAL-2795 neater error message
kjvdheide [Mon, 30 Oct 2017 18:29:11 +0000 (18:29 +0000)]
JAL-2795 neater error message

6 years agoJAL-2795 added error catching for invalid identifier
kjvdheide [Mon, 30 Oct 2017 18:09:38 +0000 (18:09 +0000)]
JAL-2795 added error catching for invalid identifier

6 years agoJAL-2795 changed getting index of identifier to Stream (moved to Java 8)
kjvdheide [Mon, 30 Oct 2017 17:15:07 +0000 (17:15 +0000)]
JAL-2795 changed getting index of identifier to Stream (moved to Java 8)

Searching through with Stream prevents having to duplicate the array
with Arrays.toList

6 years agoJAL-2795 rebuilt MatrixConverter to be purely static
kjvdheide [Mon, 30 Oct 2017 16:29:31 +0000 (16:29 +0000)]
JAL-2795 rebuilt MatrixConverter to be purely static

6 years agoJAL-2795 finalized method arguments; commited forester matrix changes
kjvdheide [Mon, 30 Oct 2017 15:45:14 +0000 (15:45 +0000)]
JAL-2795 finalized method arguments; commited forester matrix changes

6 years agoJAL-2795 removed unneeded for loop (woops) and initialized identifiers[]
kjvdheide [Mon, 30 Oct 2017 15:38:35 +0000 (15:38 +0000)]
JAL-2795 removed unneeded for loop (woops) and initialized identifiers[]

6 years agoJAL-2795 implemented getting/setting identifiers
kjvdheide [Mon, 30 Oct 2017 15:33:41 +0000 (15:33 +0000)]
JAL-2795 implemented getting/setting identifiers

6 years agoJAL-2795 added comments links from ForesterMatrix to MatrixI
kjvdheide [Mon, 30 Oct 2017 13:48:16 +0000 (13:48 +0000)]
JAL-2795 added comments links from ForesterMatrix to MatrixI

6 years agoJAL-2795 removed now unneeded values variable in ForesterMatrix
kjvdheide [Mon, 30 Oct 2017 13:23:57 +0000 (13:23 +0000)]
JAL-2795 removed now unneeded values variable in ForesterMatrix

6 years agoJAL-2795 add get for all matrix values to MatrixI (and concrete classes)
kjvdheide [Mon, 30 Oct 2017 13:22:17 +0000 (13:22 +0000)]
JAL-2795 add get for all matrix values to MatrixI (and concrete classes)

6 years agoJAL-2795 foresterMatrix now stores distance values itself
kjvdheide [Mon, 30 Oct 2017 11:50:05 +0000 (11:50 +0000)]
JAL-2795 foresterMatrix now stores distance values itself

6 years agoJAL-2795 more matrix implementations
kjvdheide [Sun, 29 Oct 2017 16:51:31 +0000 (16:51 +0000)]
JAL-2795 more matrix implementations

6 years agoJAL-2795 moved ForesterMatrix to ext.forester
kjvdheide [Sat, 28 Oct 2017 19:58:37 +0000 (20:58 +0100)]
JAL-2795 moved ForesterMatrix to ext.forester

6 years agoJAL-2795 Added get and set values to the converted matrix
kjvdheide [Fri, 27 Oct 2017 15:47:28 +0000 (16:47 +0100)]
JAL-2795 Added get and set values to the converted matrix

6 years agoJAL-2810 prototype retrieve ID tab for the Uniprot FTS panel
Jim Procter [Fri, 27 Oct 2017 16:26:43 +0000 (17:26 +0100)]
JAL-2810 prototype retrieve ID tab for the Uniprot FTS panel

6 years agoJAL-2795 start of Jalview's Matrix conversion
kjvdheide [Fri, 27 Oct 2017 15:42:09 +0000 (16:42 +0100)]
JAL-2795 start of Jalview's Matrix conversion

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
kjvdheide [Fri, 27 Oct 2017 15:33:26 +0000 (16:33 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer

6 years agoJAL-2804 update search results when enter pressed or query retrieved from history
Jim Procter [Fri, 27 Oct 2017 15:21:14 +0000 (16:21 +0100)]
JAL-2804 update search results when enter pressed or query retrieved from history

6 years agoJAL-2804 checkbox to enable/disable auto search (with tooltip)
Jim Procter [Fri, 27 Oct 2017 15:18:48 +0000 (16:18 +0100)]
JAL-2804 checkbox to enable/disable auto search (with tooltip)

6 years agoJAL-2804 kludge method to test if last key event handled was ENTER
Jim Procter [Fri, 27 Oct 2017 15:13:53 +0000 (16:13 +0100)]
JAL-2804 kludge method to test if last key event handled was ENTER

6 years agoJAL-2526 updated javadoc
gmungoc [Fri, 27 Oct 2017 13:15:20 +0000 (14:15 +0100)]
JAL-2526 updated javadoc

6 years agoStart of matrix converter
kjvdheide [Thu, 26 Oct 2017 22:22:42 +0000 (23:22 +0100)]
Start of matrix converter

6 years agoAdded proper title to aptx trees
kjvdheide [Thu, 26 Oct 2017 20:57:16 +0000 (21:57 +0100)]
Added proper title to aptx trees

6 years agotest name change
kjvdheide [Thu, 26 Oct 2017 20:57:01 +0000 (21:57 +0100)]
test name change

6 years agoMade FreeUpMemoryTest compatible with modified CalculationChooser
kjvdheide [Thu, 26 Oct 2017 20:37:40 +0000 (21:37 +0100)]
Made FreeUpMemoryTest compatible with modified CalculationChooser