jalview.git
6 years agoJAL-2674 Added missing null check feature/JAL-2674take2
kiramt [Wed, 8 Nov 2017 07:59:44 +0000 (07:59 +0000)]
JAL-2674 Added missing null check

6 years agoJAL-2674 iterator updates
kiramt [Mon, 9 Oct 2017 08:58:56 +0000 (09:58 +0100)]
JAL-2674 iterator updates

6 years agoJAL-2674 Last moves to iterators
kiramt [Fri, 6 Oct 2017 13:04:44 +0000 (14:04 +0100)]
JAL-2674 Last moves to iterators

6 years agoJAL-2647 stashing
kiramt [Fri, 6 Oct 2017 09:29:29 +0000 (10:29 +0100)]
JAL-2647 stashing

6 years agoJAL-2674 Removed a stray Vector
kiramt [Thu, 5 Oct 2017 14:41:14 +0000 (15:41 +0100)]
JAL-2674 Removed a stray Vector

6 years agoJAL-2674 Rationalising iterators and retesting
kiramt [Thu, 5 Oct 2017 14:32:17 +0000 (15:32 +0100)]
JAL-2674 Rationalising iterators and retesting

6 years agoJAL-2674 Adjustments to hideColumns
kiramt [Wed, 4 Oct 2017 15:11:59 +0000 (16:11 +0100)]
JAL-2674 Adjustments to hideColumns

6 years agoJAL-2674 more adjustments to locateVisibleBoundsOfSequence
kiramt [Wed, 4 Oct 2017 12:39:50 +0000 (13:39 +0100)]
JAL-2674 more adjustments to locateVisibleBoundsOfSequence

6 years agoJAL-2674 Simplify locateVisibleBoundsOfSequence
kiramt [Wed, 4 Oct 2017 12:19:46 +0000 (13:19 +0100)]
JAL-2674 Simplify locateVisibleBoundsOfSequence

Take advantage of sequence cursor changes where possible

6 years agoJAL-2674 tidy
kiramt [Wed, 4 Oct 2017 07:57:16 +0000 (08:57 +0100)]
JAL-2674 tidy

6 years agoJAL-2647 unit test
kiramt [Tue, 3 Oct 2017 15:23:40 +0000 (16:23 +0100)]
JAL-2647 unit test

6 years agoJAL-2674 testing
kiramt [Tue, 3 Oct 2017 13:50:39 +0000 (14:50 +0100)]
JAL-2674 testing

6 years agoJAL-2674 working refactor of drawPanel iteration
kiramt [Tue, 3 Oct 2017 10:43:36 +0000 (11:43 +0100)]
JAL-2674 working refactor of drawPanel iteration

6 years agoJAL-2674 2nd attempt to refactor seqcanvas drawing to iterator
kiramt [Tue, 3 Oct 2017 06:45:06 +0000 (07:45 +0100)]
JAL-2674 2nd attempt to refactor seqcanvas drawing to iterator

6 years agoJAL-2674 iterator for visible blocks with absolute positions
kiramt [Mon, 2 Oct 2017 12:58:45 +0000 (13:58 +0100)]
JAL-2674 iterator for visible blocks with absolute positions

6 years agoJAL-2674 Tidies
kiramt [Fri, 29 Sep 2017 14:01:08 +0000 (15:01 +0100)]
JAL-2674 Tidies

6 years agoJAL-2674 finish with iterators for now
kiramt [Fri, 29 Sep 2017 13:22:30 +0000 (14:22 +0100)]
JAL-2674 finish with iterators for now

6 years agoJAL=2674 Removed getHiddenColumnsCopy
kiramt [Fri, 29 Sep 2017 10:27:13 +0000 (11:27 +0100)]
JAL=2674 Removed getHiddenColumnsCopy

6 years agoJAL-2674 reverted attempt at visible regions iterator
kiramt [Fri, 29 Sep 2017 09:26:15 +0000 (10:26 +0100)]
JAL-2674 reverted attempt at visible regions iterator

6 years agoJAL-2647 more iterators
kiramt [Thu, 28 Sep 2017 12:16:05 +0000 (13:16 +0100)]
JAL-2647 more iterators

6 years agoJAL-2674 Removing most calls to getHiddenColumnsCopy
kiramt [Wed, 27 Sep 2017 10:28:24 +0000 (11:28 +0100)]
JAL-2674 Removing most calls to getHiddenColumnsCopy

6 years agoJAL-2674 tidied up CigarArray
kiramt [Tue, 26 Sep 2017 19:42:51 +0000 (20:42 +0100)]
JAL-2674 tidied up CigarArray

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2742' into feature/JAL-2674take2
kiramt [Tue, 26 Sep 2017 19:41:30 +0000 (20:41 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2742' into feature/JAL-2674take2

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-2674 uncomment test
kiramt [Tue, 26 Sep 2017 18:36:10 +0000 (19:36 +0100)]
JAL-2674 uncomment test

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2742' into
kiramt [Tue, 26 Sep 2017 18:35:30 +0000 (19:35 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2742' into
feature/JAL-2674take2

Conflicts:
src/jalview/datamodel/CigarArray.java

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-2674 Changed CigarArray constructor to use HiddenColumns iterator
kiramt [Tue, 26 Sep 2017 13:49:16 +0000 (14:49 +0100)]
JAL-2674 Changed CigarArray constructor to use HiddenColumns iterator

6 years agoJAL-2674 more List<int[]> -> HiddenColumns copy changes
kiramt [Tue, 26 Sep 2017 13:04:36 +0000 (14:04 +0100)]
JAL-2674 more List<int[]> -> HiddenColumns copy changes

6 years agoJAL-2674 Unit test for new copy constructor.
kiramt [Tue, 26 Sep 2017 12:56:12 +0000 (13:56 +0100)]
JAL-2674 Unit test for new copy constructor.

6 years agoJAL-2674 Changes to pasting
kiramt [Tue, 26 Sep 2017 12:46:26 +0000 (13:46 +0100)]
JAL-2674 Changes to pasting

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2740' into feature/JAL-2674take2
kiramt [Tue, 26 Sep 2017 11:22:50 +0000 (12:22 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2740' into feature/JAL-2674take2

6 years agoJAL-2740 additional unit testing bug/JAL-2740
kiramt [Tue, 26 Sep 2017 11:10:52 +0000 (12:10 +0100)]
JAL-2740 additional unit testing

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2740' into feature/JAL-2674take2
kiramt [Tue, 26 Sep 2017 10:58:05 +0000 (11:58 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2740' into feature/JAL-2674take2

6 years agoJAL-2740 removed unwanted code, added unit test
kiramt [Tue, 26 Sep 2017 10:56:39 +0000 (11:56 +0100)]
JAL-2740 removed unwanted code, added unit test

6 years agoJAL-2674 HiddenColumns interface tidies
kiramt [Tue, 26 Sep 2017 10:36:29 +0000 (11:36 +0100)]
JAL-2674 HiddenColumns interface tidies

6 years agoJAL-2647 Added iterators and associated tests and benchmarks
kiramt [Tue, 26 Sep 2017 09:26:42 +0000 (10:26 +0100)]
JAL-2647 Added iterators and associated tests and benchmarks

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2739' into feature/JAL-2674take2
kiramt [Fri, 22 Sep 2017 13:16:31 +0000 (14:16 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2739' into feature/JAL-2674take2

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-2674 add bounds to findHiddenRegionPositions
kiramt [Fri, 22 Sep 2017 09:50:46 +0000 (10:50 +0100)]
JAL-2674 add bounds to findHiddenRegionPositions

6 years agoJAL-2674 Made gui ScalePanel reveal menus consistent with applet
kiramt [Thu, 21 Sep 2017 17:13:49 +0000 (18:13 +0100)]
JAL-2674 Made gui ScalePanel reveal menus consistent with applet

6 years agoJAL-2674 unit test for gapBitSet
kiramt [Thu, 21 Sep 2017 16:00:56 +0000 (17:00 +0100)]
JAL-2674 unit test for gapBitSet

6 years agoJAL-2674 Rewrote propagateInsertions
kiramt [Thu, 21 Sep 2017 13:36:07 +0000 (14:36 +0100)]
JAL-2674 Rewrote propagateInsertions

6 years agoJAL-2674 Reset tests
kiramt [Thu, 21 Sep 2017 08:08:22 +0000 (09:08 +0100)]
JAL-2674 Reset tests

6 years agoJAL-2674 fix up interface of locateVisibleBoundsOfSequence
kiramt [Wed, 20 Sep 2017 15:25:06 +0000 (16:25 +0100)]
JAL-2674 fix up interface of locateVisibleBoundsOfSequence

6 years agoJAL-2674 Transferred updated unit tests from first 2674 branch
kiramt [Wed, 20 Sep 2017 15:14:15 +0000 (16:14 +0100)]
JAL-2674 Transferred updated unit tests from first 2674 branch

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

6 years agoJAL-2724 release notes for 2.10.2b1
Jim Procter [Wed, 6 Sep 2017 10:56:08 +0000 (11:56 +0100)]
JAL-2724 release notes for 2.10.2b1

6 years agoJAL-2724 patch to fix ClassCastException - method should be refactored and tests...
Jim Procter [Wed, 6 Sep 2017 10:55:57 +0000 (11:55 +0100)]
JAL-2724 patch to fix ClassCastException - method should be refactored and tests written as part of JAL-2725

6 years agoMerge remote-tracking branch 'origin/bug/JAL-2722' into portforward/JAL-2675_2102b1to2103 portforward/JAL-2675_2102b1to2103
gmungoc [Wed, 6 Sep 2017 10:43:37 +0000 (11:43 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-2722' into portforward/JAL-2675_2102b1to2103

6 years agoJAL-2587 Removed dissolve
kiramt [Wed, 30 Aug 2017 06:35:51 +0000 (07:35 +0100)]
JAL-2587 Removed dissolve

Conflicts:
src/jalview/gui/OverviewCanvas.java

6 years agoJAL-2665 check for null selection group image
gmungoc [Tue, 5 Sep 2017 14:40:41 +0000 (15:40 +0100)]
JAL-2665 check for null selection group image

6 years agoMerge branch 'bug/JAL-2722' into releases/Release_2_10_2b1_Branch
Jim Procter [Tue, 5 Sep 2017 17:26:37 +0000 (18:26 +0100)]
Merge branch 'bug/JAL-2722' into releases/Release_2_10_2b1_Branch

6 years agoJAL-2665 check for null selection group image
gmungoc [Tue, 5 Sep 2017 14:40:41 +0000 (15:40 +0100)]
JAL-2665 check for null selection group image

6 years agoJAL-2722 unit test bug/JAL-2722
kiramt [Tue, 5 Sep 2017 13:30:08 +0000 (14:30 +0100)]
JAL-2722 unit test

6 years agoJAL-2722 Reinstate allGroups value setting in getResidueColour
kiramt [Tue, 5 Sep 2017 13:04:17 +0000 (14:04 +0100)]
JAL-2722 Reinstate allGroups value setting in getResidueColour

6 years agoMerge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103
Jim Procter [Tue, 5 Sep 2017 12:58:04 +0000 (13:58 +0100)]
Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103

 Conflicts:
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/SeqCanvas.java

6 years agoMerge branch 'master' into portforward/JAL-2675_2102b1to2103
Jim Procter [Tue, 5 Sep 2017 12:41:45 +0000 (13:41 +0100)]
Merge branch 'master' into portforward/JAL-2675_2102b1to2103
update and resolve conflicts after 2.10.2b1 release

 Conflicts:
src/jalview/gui/SeqCanvas.java

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch'
Jim Procter [Tue, 5 Sep 2017 08:13:46 +0000 (09:13 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch'

6 years agoJAL-2675 update destination jar name of min-jabaws-client to 2.2
Jim Procter [Tue, 5 Sep 2017 07:08:22 +0000 (08:08 +0100)]
JAL-2675 update destination jar name of min-jabaws-client to 2.2

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch'
Jim Procter [Mon, 4 Sep 2017 22:01:34 +0000 (23:01 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch'

6 years agoJAL-2675 fix grammar
Jim Procter [Mon, 4 Sep 2017 22:01:12 +0000 (23:01 +0100)]
JAL-2675 fix grammar

6 years agoJAL-2588 update overview image - show the new gap shading
Jim Procter [Mon, 4 Sep 2017 21:59:19 +0000 (22:59 +0100)]
JAL-2588 update overview image - show the new gap shading

6 years agoMerge branch 'releases/Release_2_10_2b1_Branch'
Jim Procter [Mon, 4 Sep 2017 20:39:38 +0000 (21:39 +0100)]
Merge branch 'releases/Release_2_10_2b1_Branch'

6 years agoJAL-2675 what’s new for 2.10.2b1
Jim Procter [Mon, 4 Sep 2017 19:11:44 +0000 (20:11 +0100)]
JAL-2675 what’s new for 2.10.2b1

6 years agoJAL-2675 source license
Jim Procter [Mon, 4 Sep 2017 18:51:31 +0000 (19:51 +0100)]
JAL-2675 source license

6 years agoMerge branch 'feature/JAL-2587' into documentation/JAL-2675_release2102b1
Jim Procter [Mon, 4 Sep 2017 17:54:37 +0000 (18:54 +0100)]
Merge branch 'feature/JAL-2587' into documentation/JAL-2675_release2102b1

6 years agoMerge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch
Jim Procter [Mon, 4 Sep 2017 16:23:52 +0000 (17:23 +0100)]
Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2b1_Branch

6 years agoJAL-2673 JAL-2675 release notes and release date for 2.10.2b1
Jim Procter [Mon, 4 Sep 2017 16:22:46 +0000 (17:22 +0100)]
JAL-2673 JAL-2675 release notes and release date for 2.10.2b1