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

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git
kjvdheide [Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/gui/TreePanel.java

6 years agoJAL-2698 update version and cut release branch
Jim Procter [Thu, 26 Oct 2017 16:45:43 +0000 (17:45 +0100)]
JAL-2698 update version and cut release branch

6 years agoJAL-2546 release notes
Jim Procter [Thu, 26 Oct 2017 16:31:40 +0000 (17:31 +0100)]
JAL-2546 release notes

6 years agoJAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml...
Jim Procter [Thu, 26 Oct 2017 16:18:57 +0000 (17:18 +0100)]
JAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml tests.

6 years agoAdded getters for scoremodel & scoreparams in TreeBuilder
kjvdheide [Thu, 26 Oct 2017 15:58:22 +0000 (16:58 +0100)]
Added getters for scoremodel & scoreparams in TreeBuilder

6 years agoMerge branch 'feature/JAL-2488finalize' into develop
Jim Procter [Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)]
Merge branch 'feature/JAL-2488finalize' into develop

6 years agoTreeBuilder now stores the used ScoreModel and ScoreParams
kjvdheide [Thu, 26 Oct 2017 15:20:25 +0000 (16:20 +0100)]
TreeBuilder now stores the used ScoreModel and ScoreParams

6 years agoJAL-2036 2.10.3 release notes
Jim Procter [Thu, 26 Oct 2017 15:20:14 +0000 (16:20 +0100)]
JAL-2036 2.10.3 release notes

6 years agosmall name fixes in TreeBuilder
kjvdheide [Thu, 26 Oct 2017 15:12:17 +0000 (16:12 +0100)]
small name fixes in TreeBuilder

6 years agoAdded TreeBuilder as parameter to the converter constructor
kjvdheide [Thu, 26 Oct 2017 15:12:04 +0000 (16:12 +0100)]
Added TreeBuilder as parameter to the converter constructor

6 years agoName changed of aptx treebuilder to treeconverter
kjvdheide [Thu, 26 Oct 2017 15:10:25 +0000 (16:10 +0100)]
Name changed of aptx treebuilder to treeconverter

6 years agoadded getSeqData to TreeBuilder
kjvdheide [Thu, 26 Oct 2017 14:49:56 +0000 (15:49 +0100)]
added getSeqData to TreeBuilder

6 years agoJAL-2793 cancelling font changed dialog didn't call ap.fontChanged() to reset layout
Jim Procter [Thu, 26 Oct 2017 14:47:32 +0000 (15:47 +0100)]
JAL-2793 cancelling font changed dialog didn't call ap.fontChanged() to reset layout

6 years agoAdded full names to the tree algorithm enum
kjvdheide [Thu, 26 Oct 2017 14:46:08 +0000 (15:46 +0100)]
Added full names to the tree algorithm enum

6 years agoadded abbreviations
kjvdheide [Thu, 26 Oct 2017 14:17:58 +0000 (15:17 +0100)]
added abbreviations

6 years agoadded enum for the different tree algorithms
kjvdheide [Thu, 26 Oct 2017 14:10:58 +0000 (15:10 +0100)]
added enum for the different tree algorithms

6 years agoCouple more thread names
kjvdheide [Thu, 26 Oct 2017 13:59:22 +0000 (14:59 +0100)]
Couple more thread names

6 years agonamed most Jalview threads
kjvdheide [Thu, 26 Oct 2017 13:53:04 +0000 (14:53 +0100)]
named most Jalview threads

6 years agoJAL-2548 release notes
Jim Procter [Thu, 26 Oct 2017 13:41:34 +0000 (14:41 +0100)]
JAL-2548 release notes

6 years agoMerge branch 'bug/JAL-2776toggleGroupColour' into develop
Jim Procter [Thu, 26 Oct 2017 10:51:35 +0000 (11:51 +0100)]
Merge branch 'bug/JAL-2776toggleGroupColour' into develop

6 years agoJAL-2684 JAL-2685 release notes
Jim Procter [Thu, 26 Oct 2017 10:50:03 +0000 (11:50 +0100)]
JAL-2684 JAL-2685 release notes

6 years agoJAL-2685 tidy up html doc
Jim Procter [Thu, 26 Oct 2017 10:40:25 +0000 (11:40 +0100)]
JAL-2685 tidy up html doc

6 years agoMerge branch 'features/JAL-2685pairwiseSeqLimits' into develop
Jim Procter [Thu, 26 Oct 2017 10:14:38 +0000 (11:14 +0100)]
Merge branch 'features/JAL-2685pairwiseSeqLimits' into develop

6 years agoJAL-2392 test asserts for progressbar creation on the Swing GUI thread.
Jim Procter [Thu, 26 Oct 2017 09:57:13 +0000 (10:57 +0100)]
JAL-2392 test asserts for progressbar creation on the Swing GUI thread.

6 years agoremoved accidental added enters, commented out broken memory test line
kjvdheide [Thu, 26 Oct 2017 09:10:23 +0000 (10:10 +0100)]
removed accidental added enters, commented out broken memory test line

6 years agofinished up tests for trees made from jalview data
kjvdheide [Wed, 25 Oct 2017 18:27:36 +0000 (19:27 +0100)]
finished up tests for trees made from jalview data

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
kjvdheide [Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer

6 years agoImplemented distance tests
kjvdheide [Wed, 25 Oct 2017 18:15:53 +0000 (19:15 +0100)]
Implemented distance tests

6 years agoImplemented tree title test for tree made from Jalview
kjvdheide [Wed, 25 Oct 2017 17:30:02 +0000 (18:30 +0100)]
Implemented tree title test for tree made from Jalview

6 years agoAdded tree title test
kjvdheide [Wed, 25 Oct 2017 17:26:09 +0000 (18:26 +0100)]
Added tree title test

6 years agoRemoved redundant annotations
kjvdheide [Wed, 25 Oct 2017 17:03:14 +0000 (18:03 +0100)]
Removed redundant annotations

6 years agoJAL-2617 release notes
Jim Procter [Wed, 25 Oct 2017 16:24:27 +0000 (17:24 +0100)]
JAL-2617 release notes

6 years agoMerge branch 'bug/JAL-2617mappedStopCodon' into develop
Jim Procter [Wed, 25 Oct 2017 16:23:03 +0000 (17:23 +0100)]
Merge branch 'bug/JAL-2617mappedStopCodon' into develop

6 years agoJAL-2636 release notes
Jim Procter [Wed, 25 Oct 2017 15:45:05 +0000 (16:45 +0100)]
JAL-2636 release notes

6 years agoJAL-2667 release notes
Jim Procter [Wed, 25 Oct 2017 15:37:57 +0000 (16:37 +0100)]
JAL-2667 release notes

6 years agoMerge branch 'bug/JAL-2667mouseWheelWrapped' into develop
Jim Procter [Wed, 25 Oct 2017 15:33:01 +0000 (16:33 +0100)]
Merge branch 'bug/JAL-2667mouseWheelWrapped' into develop

6 years agoJAL-2742 release notes - pending confirmation that there was impact to user
Jim Procter [Wed, 25 Oct 2017 15:29:24 +0000 (16:29 +0100)]
JAL-2742 release notes - pending confirmation that there was impact to user

6 years agoJAL-2727 release notes
Jim Procter [Wed, 25 Oct 2017 15:08:20 +0000 (16:08 +0100)]
JAL-2727 release notes

6 years agoAdded branch name tests
kjvdheide [Wed, 25 Oct 2017 15:08:16 +0000 (16:08 +0100)]
Added branch name tests

6 years agoJAL-2727 add not to Test failed message recommending re-running manually as per Mungo...
Jim Procter [Wed, 25 Oct 2017 15:06:31 +0000 (16:06 +0100)]
JAL-2727 add not to Test failed message recommending re-running manually as per Mungo’s recommendation in comments

6 years agoMerge branch 'bug/JAL-2727closeAllFreeMemory' into develop
Jim Procter [Wed, 25 Oct 2017 14:53:29 +0000 (15:53 +0100)]
Merge branch 'bug/JAL-2727closeAllFreeMemory' into develop

6 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
kjvdheide [Wed, 25 Oct 2017 14:51:38 +0000 (15:51 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer

6 years agoAdded abstract class for tree viewer testing, rearranged existing tests
kjvdheide [Wed, 25 Oct 2017 14:50:40 +0000 (15:50 +0100)]
Added abstract class for tree viewer testing, rearranged existing tests

6 years agoJAL-2732 JAL-1900 JAL-1625 release notes
Jim Procter [Wed, 25 Oct 2017 14:38:06 +0000 (15:38 +0100)]
JAL-2732 JAL-1900 JAL-1625 release notes

6 years agoMerge branch 'bugs/JAL-2779_osx_dialogsequencingbroke' into develop
Jim Procter [Wed, 25 Oct 2017 14:37:16 +0000 (15:37 +0100)]
Merge branch 'bugs/JAL-2779_osx_dialogsequencingbroke' into develop

6 years agoJAL-2779 remove empty block and if statement
Jim Procter [Wed, 25 Oct 2017 14:36:42 +0000 (15:36 +0100)]
JAL-2779 remove empty block and if statement