Jim Procter [Tue, 29 Aug 2017 14:44:55 +0000 (15:44 +0100)]
Merge branch 'patch/JAL-2698_blockingAutoAssociateDiaog' into develop
kiramt [Tue, 29 Aug 2017 13:55:53 +0000 (14:55 +0100)]
JAL-2527 Added overview prefs - don't get picked up by overview yet
Jim Procter [Tue, 29 Aug 2017 13:35:37 +0000 (14:35 +0100)]
JAL-2698 spawn a thread to test for and raise auto associate dialogs for PDB file drops on the alignment view
kiramt [Tue, 29 Aug 2017 10:59:54 +0000 (11:59 +0100)]
JAL-2665 OOM checks just in case
kiramt [Tue, 29 Aug 2017 10:56:20 +0000 (11:56 +0100)]
JAL-2665 OOM checks just in case
kiramt [Tue, 29 Aug 2017 09:48:54 +0000 (10:48 +0100)]
JAL-2665 OOM check
kiramt [Tue, 29 Aug 2017 08:40:08 +0000 (09:40 +0100)]
JAL-2665 ported fix to 2.10.3. Doesn't work.
kiramt [Tue, 29 Aug 2017 08:28:29 +0000 (09:28 +0100)]
JAL-2665 Corrected to draw selections for wrapped printing
kiramt [Mon, 28 Aug 2017 15:38:03 +0000 (16:38 +0100)]
JAL-2527 Started adding overview preferences
kiramt [Mon, 28 Aug 2017 11:23:58 +0000 (12:23 +0100)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2665-2.10.3
Conflicts:
src/jalview/gui/SeqCanvas.java
kiramt [Mon, 28 Aug 2017 11:15:35 +0000 (12:15 +0100)]
Merge remote-tracking branch 'origin/releases/Release_2_10_2b1_Branch'
into bug/JAL-2665-2.10.2b
Conflicts:
src/jalview/gui/SeqCanvas.java
kiramt [Mon, 28 Aug 2017 10:56:33 +0000 (11:56 +0100)]
JAL-2665 Changes for review comments; printing with selgroup working
Jim Procter [Sun, 27 Aug 2017 14:50:03 +0000 (15:50 +0100)]
JAL-2691 assert chains are recovered by AAStructureBindingModel
Jim Procter [Sun, 27 Aug 2017 14:49:02 +0000 (15:49 +0100)]
JAL-2691 catchall if passed dataset sequences (tests only)
Jim Procter [Sun, 27 Aug 2017 13:25:01 +0000 (14:25 +0100)]
JAL-2693 TODO comments
Jim Procter [Sun, 27 Aug 2017 13:23:06 +0000 (14:23 +0100)]
JAL-2691 discover any existing chain mappings for a structure view
Jim Procter [Sun, 27 Aug 2017 13:17:30 +0000 (14:17 +0100)]
JAL-2691 cached view combo box value javadoc
kiramt [Fri, 25 Aug 2017 17:36:26 +0000 (18:36 +0100)]
JAL-2587 Removed duplicate events fired to progress bar
kiramt [Fri, 25 Aug 2017 13:13:48 +0000 (14:13 +0100)]
JAL-2587 Removed annoying double repaint on hide insertions
kiramt [Fri, 25 Aug 2017 11:54:05 +0000 (12:54 +0100)]
JAL-2587 Update overview progress bar while drawing rows too
kiramt [Fri, 25 Aug 2017 08:41:25 +0000 (09:41 +0100)]
JAL-2587 Progress bar sizing tweaks
gmungoc [Fri, 25 Aug 2017 08:27:46 +0000 (09:27 +0100)]
JAL-2480 suppress debug timing output that got left in
kiramt [Fri, 25 Aug 2017 07:03:52 +0000 (08:03 +0100)]
JAL-2587 Made progress bar display before overview calc starts
gmungoc [Wed, 23 Aug 2017 13:42:32 +0000 (14:42 +0100)]
JAL-2435 last lost commit e926a5d redone
gmungoc [Wed, 23 Aug 2017 13:42:32 +0000 (14:42 +0100)]
JAL-2435 last lost commit e926a5d redone
gmungoc [Wed, 23 Aug 2017 10:48:20 +0000 (11:48 +0100)]
JAL-2481 a smidgin more test coverage of findFeatures
Jim Procter [Tue, 22 Aug 2017 21:42:11 +0000 (22:42 +0100)]
JAL-1551 formatting
Jim Procter [Tue, 22 Aug 2017 21:13:07 +0000 (22:13 +0100)]
JAL-2681 cross-ref selection for targeted debugging
Jim Procter [Tue, 22 Aug 2017 21:12:07 +0000 (22:12 +0100)]
JAL-2681 source formatting
Jim Procter [Tue, 22 Aug 2017 21:10:27 +0000 (22:10 +0100)]
JAL-2681 canonicalise DB source before fetching to avoid fetching the same ref !
Jim Procter [Tue, 22 Aug 2017 21:09:44 +0000 (22:09 +0100)]
JAL-2681 formatting
gmungoc [Tue, 22 Aug 2017 15:03:01 +0000 (16:03 +0100)]
JAL-2680 remove all mappings in test teardown
gmungoc [Tue, 22 Aug 2017 12:36:28 +0000 (13:36 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Mon, 21 Aug 2017 14:20:36 +0000 (15:20 +0100)]
JAL-2680 clear down all mappings before test
Jim Procter [Mon, 21 Aug 2017 13:47:51 +0000 (14:47 +0100)]
Merge branch 'documentation/JAL-2675_release2102b1' into develop
Jim Procter [Mon, 21 Aug 2017 13:47:22 +0000 (14:47 +0100)]
Merge branch 'documentation/JAL-2675_release2102b1' into releases/Release_2_10_2_Branch
Jim Procter [Mon, 21 Aug 2017 13:46:45 +0000 (14:46 +0100)]
JAL-2675 typo in what's new href
Jim Procter [Mon, 21 Aug 2017 13:22:52 +0000 (14:22 +0100)]
JAL-2588 don’t test char==gap until we know the shader won’t colour gaps itself
Jim Procter [Mon, 21 Aug 2017 13:21:58 +0000 (14:21 +0100)]
JAL-2588 field on overview colour finder for default gap colour
gmungoc [Mon, 21 Aug 2017 13:06:46 +0000 (14:06 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
Conflicts:
src/MCview/PDBChain.java
src/jalview/analysis/AlignmentSorter.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/Dna.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/Finder.java
src/jalview/appletgui/SeqPanel.java
src/jalview/commands/EditCommand.java
src/jalview/datamodel/AlignedCodonFrame.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceFeature.java
src/jalview/datamodel/xdb/embl/EmblEntry.java
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationExporter.java
src/jalview/gui/CutAndPasteTransfer.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/Finder.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/io/FeaturesFile.java
src/jalview/io/JSONFile.java
src/jalview/io/gff/InterProScanHelper.java
src/jalview/io/vamsas/Datasetsequence.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/util/RangeComparator.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/jws2/AADisorderClient.java
Jim Procter [Fri, 18 Aug 2017 15:34:03 +0000 (16:34 +0100)]
JAL-2588 JAL-2603 JAL-2610 release notes and docs
Jim Procter [Fri, 18 Aug 2017 14:38:20 +0000 (15:38 +0100)]
Merge branch 'feature/2588' into merge/develop_feature/2588_JAL-2588
Jim Procter [Fri, 18 Aug 2017 13:17:50 +0000 (14:17 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Fri, 18 Aug 2017 13:15:40 +0000 (14:15 +0100)]
JAL-2675 bump version for branch to 2.10.2b1
Jim Procter [Fri, 18 Aug 2017 13:14:17 +0000 (14:14 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Fri, 18 Aug 2017 13:13:28 +0000 (14:13 +0100)]
JAL-1551 formatting
Jim Procter [Fri, 18 Aug 2017 13:08:03 +0000 (14:08 +0100)]
JAL-2675 release notes entry for 2.10.2b1, updated what’s new and link to latest notes in help.
kiramt [Fri, 18 Aug 2017 10:53:23 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/develop' into feature/JAL-2664
kiramt [Fri, 18 Aug 2017 10:44:18 +0000 (11:44 +0100)]
JAL-2664 Adjusted colour of hidden cols/seqs
kiramt [Fri, 18 Aug 2017 10:34:46 +0000 (11:34 +0100)]
JAL-2664 Correct colouring for rows
kiramt [Fri, 18 Aug 2017 10:06:10 +0000 (11:06 +0100)]
JAL-2662 Tidy
kiramt [Fri, 18 Aug 2017 10:03:22 +0000 (11:03 +0100)]
Merge branch 'develop' into task/JAL-2662
kiramt [Fri, 18 Aug 2017 09:55:08 +0000 (10:55 +0100)]
JAL-2662 First benchmark running
kiramt [Fri, 18 Aug 2017 08:19:58 +0000 (09:19 +0100)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2665
kiramt [Fri, 18 Aug 2017 08:13:57 +0000 (09:13 +0100)]
JAL-2665 Comments
kiramt [Fri, 18 Aug 2017 08:03:44 +0000 (09:03 +0100)]
JAL-2665 Refactoring (and side-effect fix for JAL-2672)
kiramt [Fri, 18 Aug 2017 06:50:05 +0000 (07:50 +0100)]
JAL-2665 tidies
kiramt [Thu, 17 Aug 2017 15:49:49 +0000 (16:49 +0100)]
JAL-2665 Code tidies
kiramt [Thu, 17 Aug 2017 14:16:28 +0000 (15:16 +0100)]
JAL-2665 Fixed wrapped mode group over >1 panel; and hidden cols
Jim Procter [Thu, 17 Aug 2017 12:08:49 +0000 (13:08 +0100)]
Merge branch 'releases/Release_2_10_2_Branch'
Jim Procter [Thu, 17 Aug 2017 12:07:53 +0000 (13:07 +0100)]
JAL-2418 ahem - correct year for what's new
Jim Procter [Thu, 17 Aug 2017 11:39:46 +0000 (12:39 +0100)]
Merge branch 'releases/Release_2_10_2_Branch'
Jim Procter [Thu, 17 Aug 2017 11:37:50 +0000 (12:37 +0100)]
JAL-2418 JAL-2116 use single j2se 7+ argumant with java 9 add-modules - seems to work on java 8 (windows, osx, linux) without 'use latest version' popup and also on java 9
Jim Procter [Thu, 17 Aug 2017 10:41:33 +0000 (11:41 +0100)]
JAL-2418 JAL-2116 make sure java 8,7 vm args are also listed
kiramt [Thu, 17 Aug 2017 10:23:51 +0000 (11:23 +0100)]
JAL-2665 partial fix for selection running over 2 wrapped panels
kiramt [Thu, 17 Aug 2017 08:02:34 +0000 (09:02 +0100)]
JAL-2665 Correct position of selection switching from wrap to normal
Jim Procter [Wed, 16 Aug 2017 22:24:37 +0000 (23:24 +0100)]
Merge branch 'releases/Release_2_10_2_Branch'
Jim Procter [Wed, 16 Aug 2017 22:24:25 +0000 (23:24 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 22:24:13 +0000 (23:24 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 22:23:59 +0000 (23:23 +0100)]
JAL-2418 formatting
Jim Procter [Wed, 16 Aug 2017 22:23:53 +0000 (23:23 +0100)]
JAL-2418 occupancy row in What’s New
Jim Procter [Wed, 16 Aug 2017 21:38:01 +0000 (22:38 +0100)]
Merge branch 'releases/Release_2_10_2_Branch'
Jim Procter [Wed, 16 Aug 2017 21:37:37 +0000 (22:37 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 21:30:21 +0000 (22:30 +0100)]
JAL-2418 add GPL to main sources
Jim Procter [Wed, 16 Aug 2017 21:22:11 +0000 (22:22 +0100)]
JAL-2418 source formatting
Jim Procter [Wed, 16 Aug 2017 20:52:55 +0000 (21:52 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Wed, 16 Aug 2017 20:52:36 +0000 (21:52 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 20:52:07 +0000 (21:52 +0100)]
JAL-2418 mirror fonts option doc tweak
kiramt [Wed, 16 Aug 2017 19:53:45 +0000 (20:53 +0100)]
JAL-2665 Working with hidden columns
Jim Procter [Wed, 16 Aug 2017 19:17:43 +0000 (20:17 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 16 Aug 2017 19:17:03 +0000 (20:17 +0100)]
JAL-2418 whats new for 2.10.2
Jim Procter [Wed, 16 Aug 2017 19:16:52 +0000 (20:16 +0100)]
JAL-2418 reclassify some issues to features/bugs resolved
Jim Procter [Wed, 16 Aug 2017 18:23:33 +0000 (19:23 +0100)]
JAL-2418 typos in release notes
Jim Procter [Wed, 16 Aug 2017 18:16:08 +0000 (19:16 +0100)]
JAL-2418 check groovy script one-liners for restoring legacy score model behaviour
kiramt [Wed, 16 Aug 2017 15:34:32 +0000 (16:34 +0100)]
JAL-2665 Added hidden columns group selection - almost working
kiramt [Wed, 16 Aug 2017 14:51:55 +0000 (15:51 +0100)]
JAL-2665 Selecting on wrapped alignments
kiramt [Wed, 16 Aug 2017 13:25:03 +0000 (14:25 +0100)]
JAL-2556 start to account for wrapped alignments
kiramt [Wed, 16 Aug 2017 12:28:13 +0000 (13:28 +0100)]
JAL-2665 Tidy
kiramt [Wed, 16 Aug 2017 11:20:16 +0000 (12:20 +0100)]
JAL-2665 fix resize
kiramt [Wed, 16 Aug 2017 10:40:54 +0000 (11:40 +0100)]
JAL-2556 Code tidy
kiramt [Wed, 16 Aug 2017 10:21:55 +0000 (11:21 +0100)]
JAL-2556 Resolved group update on colouring and escape
kiramt [Wed, 16 Aug 2017 10:09:39 +0000 (11:09 +0100)]
JAL-2665 Added sequence group update event.
kiramt [Wed, 16 Aug 2017 07:13:04 +0000 (08:13 +0100)]
JAL-2665 Draw selection group - works on scroll but not when static
Jim Procter [Tue, 15 Aug 2017 16:15:25 +0000 (17:15 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 15 Aug 2017 16:14:32 +0000 (17:14 +0100)]
JAL-2116 fix typo in build.xml for j2se element
Jim Procter [Tue, 15 Aug 2017 15:55:22 +0000 (16:55 +0100)]
Merge branch 'develop' into releases/Release_2_10_2_Branch
Jim Procter [Tue, 15 Aug 2017 15:55:06 +0000 (16:55 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 15 Aug 2017 14:02:19 +0000 (15:02 +0100)]
JAL-2418 bump release to Thursday
Jim Procter [Tue, 15 Aug 2017 13:54:20 +0000 (14:54 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
kiramt [Tue, 15 Aug 2017 10:48:33 +0000 (11:48 +0100)]
JAL-2265 turn off NPE
git://source.jalview.org / jalview.git / log