gmungoc [Thu, 6 Oct 2016 12:55:50 +0000 (13:55 +0100)]
Merge branch 'develop' into bug/JAL-98consensusMemory
gmungoc [Thu, 6 Oct 2016 12:14:59 +0000 (13:14 +0100)]
JAL-2252 now buffered read of 3 lines of a time in help files
gmungoc [Thu, 6 Oct 2016 07:52:55 +0000 (08:52 +0100)]
JAL-2245 checks for null added (in case EMBL fetch finds nothing)
Jim Procter [Wed, 5 Oct 2016 22:18:27 +0000 (23:18 +0100)]
JAL-2189 update year in author.props
Jim Procter [Wed, 5 Oct 2016 22:07:28 +0000 (23:07 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 22:06:23 +0000 (23:06 +0100)]
JAL-2189 CITATION file and reorder authors: 2.10: JBP, MC, TCO...
Jim Procter [Wed, 5 Oct 2016 21:15:44 +0000 (22:15 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:15:04 +0000 (22:15 +0100)]
JAL-2252 workaround for link checker not recognising multiline anchors
Jim Procter [Wed, 5 Oct 2016 21:07:18 +0000 (22:07 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:03:24 +0000 (22:03 +0100)]
JAL-2189 updated third party licenses
Jim Procter [Wed, 5 Oct 2016 20:50:09 +0000 (21:50 +0100)]
JAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:49:04 +0000 (21:49 +0100)]
JAL-2036 rebuild menus for each panel before adding to splitframe
Jim Procter [Wed, 5 Oct 2016 20:28:36 +0000 (21:28 +0100)]
JAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:08:48 +0000 (21:08 +0100)]
JAL-2189 tidy up release notes
Jim Procter [Wed, 5 Oct 2016 19:58:12 +0000 (20:58 +0100)]
JAL-2189 tweak ensembl release notes
Jim Procter [Wed, 5 Oct 2016 16:56:39 +0000 (17:56 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
JAL-2189 merge formatting and licensing updates to develop
Jim Procter [Wed, 5 Oct 2016 16:56:17 +0000 (17:56 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 16:53:20 +0000 (17:53 +0100)]
JAL-2189 formatting and release notes
Jim Procter [Wed, 5 Oct 2016 16:52:54 +0000 (17:52 +0100)]
JAL-2189 license header
Jim Procter [Wed, 5 Oct 2016 16:32:54 +0000 (17:32 +0100)]
JAL-2189 apply license
Jim Procter [Wed, 5 Oct 2016 15:52:19 +0000 (16:52 +0100)]
JAL-2189 format help
Jim Procter [Wed, 5 Oct 2016 15:33:28 +0000 (16:33 +0100)]
JAL-2189 format tests
Jim Procter [Wed, 5 Oct 2016 15:31:57 +0000 (16:31 +0100)]
JAL-2189 formatting and GPL
Jim Procter [Wed, 5 Oct 2016 15:28:14 +0000 (16:28 +0100)]
JAL-2189 source formatting
tcofoegbu [Wed, 5 Oct 2016 15:13:33 +0000 (16:13 +0100)]
QQMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 5 Oct 2016 15:13:16 +0000 (16:13 +0100)]
JAL-1563 JAL-1479 minor house-keeping for Uniprot FTS & SIFTS user docs
Jim Procter [Wed, 5 Oct 2016 15:03:09 +0000 (16:03 +0100)]
Revert "JAL-2245 Castor mapping and code changes for change to ENA XML format"
This reverts commit
30b2b47cbdfa35b127b0fb09e911815cddd9ed7b.
Jim Procter [Wed, 5 Oct 2016 14:59:59 +0000 (15:59 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Jim Procter [Wed, 5 Oct 2016 14:53:01 +0000 (15:53 +0100)]
JAL-2189 release notes/whats new
Jim Procter [Wed, 5 Oct 2016 14:52:49 +0000 (15:52 +0100)]
JAL-2189 JAL-2152 Chimera 1.11.1 minimum version requirement
gmungoc [Wed, 5 Oct 2016 14:12:01 +0000 (15:12 +0100)]
JAL-1191 revert to using SequenceOntologyLite due to downstream
dependencies
gmungoc [Wed, 5 Oct 2016 13:24:54 +0000 (14:24 +0100)]
JAL-1191 configure full SO for desktop, SOLite for applet (without
breaking the build)
gmungoc [Wed, 5 Oct 2016 11:52:45 +0000 (12:52 +0100)]
JAL-2245 defence against NullPointer if no EMBL data unmarshalled
gmungoc [Wed, 5 Oct 2016 11:51:11 +0000 (12:51 +0100)]
JAL-1191 use full SO in desktop application
gmungoc [Wed, 5 Oct 2016 11:49:44 +0000 (12:49 +0100)]
JAL-2105 update Ensembl REST version to 4.7
gmungoc [Wed, 5 Oct 2016 11:01:31 +0000 (12:01 +0100)]
JAL-1191 refined warning message
gmungoc [Wed, 5 Oct 2016 10:23:53 +0000 (11:23 +0100)]
JAL-1191 added mRNA isA transcript to SequenceOntologyLite (because
Ensembl now returning coding features as mRNA not transcript!)
gmungoc [Tue, 4 Oct 2016 15:03:18 +0000 (16:03 +0100)]
Merge branch 'bug/JAL-2245enaXmlChange' into develop
gmungoc [Tue, 4 Oct 2016 14:12:19 +0000 (15:12 +0100)]
Merge branch 'bug/JAL-2210_hack_for_Release_2_10' into develop
gmungoc [Tue, 4 Oct 2016 14:11:25 +0000 (15:11 +0100)]
JAL-2245 Castor mapping and code changes for change to ENA XML format
gmungoc [Tue, 4 Oct 2016 13:55:59 +0000 (14:55 +0100)]
JAL-2232 some fix / partial fix of failing tests
Jim Procter [Tue, 4 Oct 2016 13:28:02 +0000 (14:28 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Tue, 4 Oct 2016 13:27:22 +0000 (14:27 +0100)]
JAL-2189 release notes
gmungoc [Tue, 4 Oct 2016 12:50:02 +0000 (13:50 +0100)]
JAL-2232 added test that failed before last fix, passes after it
gmungoc [Tue, 4 Oct 2016 10:58:56 +0000 (11:58 +0100)]
JAL-2232 JAL-2154 update dbrefs to newly created dataset sequence
Jim Procter [Tue, 4 Oct 2016 09:56:46 +0000 (10:56 +0100)]
JAL-2189 link to feature sorting documentation
Jim Procter [Tue, 4 Oct 2016 09:55:47 +0000 (10:55 +0100)]
JAL-2189 JAL-2005 mention alignment order preservation when equivalent sequences are sorted.
Jim Procter [Tue, 4 Oct 2016 09:46:33 +0000 (10:46 +0100)]
JAL-2189 release notes
Jim Procter [Tue, 4 Oct 2016 09:44:44 +0000 (10:44 +0100)]
JAL-2005 JAL-599 test alignment and features for checking feature sort behaviour
gmungoc [Mon, 3 Oct 2016 16:13:57 +0000 (17:13 +0100)]
JAL-2110 javadoc formatting only
gmungoc [Mon, 3 Oct 2016 16:11:50 +0000 (17:11 +0100)]
JAL-2110 JAL-1705 handle not found (400) better
gmungoc [Mon, 3 Oct 2016 15:10:21 +0000 (16:10 +0100)]
JAL-2110 additional tests for setDatasetSequence, javadoc for isProtein
Jim Procter [Mon, 3 Oct 2016 14:08:01 +0000 (15:08 +0100)]
JAL-2189 update RELEASE file
Jim Procter [Mon, 3 Oct 2016 14:06:34 +0000 (15:06 +0100)]
JAL-2189 more release notes
Jim Procter [Mon, 3 Oct 2016 14:06:26 +0000 (15:06 +0100)]
JAL-2189 ensembl sequence fetching, locus view and variant annotation transfer docs
gmungoc [Mon, 3 Oct 2016 13:21:26 +0000 (14:21 +0100)]
JAL-98 throw exception (unhandled) for int overthrow while counting
Jim Procter [Mon, 3 Oct 2016 13:11:32 +0000 (14:11 +0100)]
JAL-2189 release notes
gmungoc [Mon, 3 Oct 2016 11:45:47 +0000 (12:45 +0100)]
JAL-98 use Profile to store consensus, ResidueCount for fast compact
counting
gmungoc [Mon, 3 Oct 2016 10:07:12 +0000 (11:07 +0100)]
JAL-98 bespoke fast percentage formatter for consensus tooltip
Jim Procter [Mon, 3 Oct 2016 08:21:48 +0000 (09:21 +0100)]
JAL-2210 use addDBRef to ensure normalisation (just in case the uniprot record is not normalised!)
Jim Procter [Mon, 3 Oct 2016 08:21:10 +0000 (09:21 +0100)]
JAL-2210 need to add both transcript and product, and Ensembl needs to be marked as a primary ref on protein, otherwise the ensembl peptide ids on uniprot don’t match up with the ones retrieved from ensembl
Jim Procter [Mon, 3 Oct 2016 08:18:03 +0000 (09:18 +0100)]
JAL-2210 JAL-2232 remove version number from ENACDS excession
Jim Procter [Mon, 3 Oct 2016 08:17:05 +0000 (09:17 +0100)]
JAL-2210 hack to remove EMBL from Protein crossrefs, and ENSEMBL from CDS crossers.
Jim Procter [Mon, 3 Oct 2016 08:16:14 +0000 (09:16 +0100)]
JAL-2210 explicit ‘doNotAdd’ list to prevent sequences retrieved from being added whose references have already been remapped to local dataset sequences
Jim Procter [Sun, 2 Oct 2016 11:27:30 +0000 (12:27 +0100)]
JAL-2210 first pass at attempting to fix CrossRef tests due to removal of sequence ID matcher based fallback for discovering crossrefs.
Jim Procter [Sun, 2 Oct 2016 11:26:40 +0000 (12:26 +0100)]
JAL-2210 remove ENSEMBL from protein DB list:
1. prevents transcript identifiers being promoted to primary refs on uniprot sequences.
2. obviates the need to add peptide product id to the uniprot sequence.
Jim Procter [Sun, 2 Oct 2016 11:24:30 +0000 (12:24 +0100)]
JAL-2210 two pass attempt to import retrieved sequences. First pass relies on matching DBRefEntry pairs, but if no sequences were added, link sequences and matching xrefs via accessions in sequence names and try import again.
Jim Procter [Sun, 2 Oct 2016 11:22:20 +0000 (12:22 +0100)]
JAL-2210 try to merge all sequences referenced by a sequence with a matching xref with ones already in dataset (rather than just ones matching the source sequence) before adding the xrefed sequence to the returned sequence set.
Jim Procter [Sun, 2 Oct 2016 11:17:14 +0000 (12:17 +0100)]
JAL-2210 comments
Jim Procter [Sun, 2 Oct 2016 11:15:21 +0000 (12:15 +0100)]
JAL-2210 discover candidate dataset sequences for an xref based on primaryDBRefs first, and only fall back to sequence name match if none are found
Jim Procter [Sun, 2 Oct 2016 11:05:44 +0000 (12:05 +0100)]
JAL-2079 pass server name when reporting FTS ‘warning/error’ messages
Jim Procter [Sat, 1 Oct 2016 16:00:05 +0000 (17:00 +0100)]
Merge branch 'develop' into bug/JAL-2210_ensembl_uniprot_primaryrefs_alternate
Jim Procter [Sat, 1 Oct 2016 12:21:29 +0000 (13:21 +0100)]
JAL-2210 factored out code for processing cross-referenced sequences retrieved via a dbref on source sequence
Jim Procter [Sat, 1 Oct 2016 12:00:34 +0000 (13:00 +0100)]
JAL-2210 refactor code to remove from a list of dbrefs those which match primary dbrefs for sequences in the dataset
Jim Procter [Fri, 30 Sep 2016 16:44:32 +0000 (17:44 +0100)]
JAL-2210 some DBRef xref/ref correspondences may add sequence but have no mapping (e.g. ENSG->Uniprot), so always check if mappings have been added even if xref’ed sequence has already been added to set to be shown to user.
Jim Procter [Fri, 30 Sep 2016 16:42:57 +0000 (17:42 +0100)]
JAL-2210 CrossRef.findInDataset should search for presence of SequenceI in dataset before anything more fancy or fuzzy.
Jim Procter [Fri, 30 Sep 2016 16:40:19 +0000 (17:40 +0100)]
JAL-2210 add uniprot+mapping between ENST and ENSP seqs
Jim Procter [Fri, 30 Sep 2016 13:35:20 +0000 (14:35 +0100)]
JAL-2238 release notes
Jim Procter [Fri, 30 Sep 2016 13:35:06 +0000 (14:35 +0100)]
JAL-2236 release notes and additional docs
gmungoc [Fri, 30 Sep 2016 13:23:46 +0000 (14:23 +0100)]
Merge branch 'develop' into bug/JAL-98consensusMemory
Jim Procter [Fri, 30 Sep 2016 13:17:53 +0000 (14:17 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch
gmungoc [Fri, 30 Sep 2016 12:51:59 +0000 (13:51 +0100)]
JAL-2236 code restored (and some compiler warnings addressed)
gmungoc [Fri, 30 Sep 2016 11:39:08 +0000 (12:39 +0100)]
Merge branch 'develop' into features/JAL-1856dbRefFetcherMessages
gmungoc [Fri, 30 Sep 2016 11:32:24 +0000 (12:32 +0100)]
JAL-2234 FER1_ARATH renamed FER2_ARATH and vice versa
gmungoc [Fri, 30 Sep 2016 08:08:17 +0000 (09:08 +0100)]
JAL-2236 fixes for desktop and applet implementation of 'append seqname'
gmungoc [Thu, 29 Sep 2016 15:45:28 +0000 (16:45 +0100)]
JAL-1856 better warning messages for sequence matching in DBRefFetcher
gmungoc [Thu, 29 Sep 2016 12:20:30 +0000 (13:20 +0100)]
JAL-2213 code warnings addressed (typed collections, string / magic
number constants)
gmungoc [Thu, 29 Sep 2016 12:18:42 +0000 (13:18 +0100)]
JAL-2213 removed PDB from db sources list; also code tidy (typed
collections,
gmungoc [Thu, 29 Sep 2016 12:17:53 +0000 (13:17 +0100)]
JAL-2213 made RESNUM constant private (not used elsewhere) to reduce
confusion
gmungoc [Thu, 29 Sep 2016 12:15:53 +0000 (13:15 +0100)]
JAL-2213 corrected wait for files to load in Jmol; extract method
refactoring of run()
gmungoc [Thu, 29 Sep 2016 11:56:51 +0000 (12:56 +0100)]
JAL-2237 apply default filter as sort in initial search
gmungoc [Thu, 29 Sep 2016 11:49:56 +0000 (12:49 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
Jim Procter [Thu, 29 Sep 2016 11:21:39 +0000 (12:21 +0100)]
JAL-2089 fix broken help link
Jim Procter [Thu, 29 Sep 2016 10:58:55 +0000 (11:58 +0100)]
Merge branch 'patch/JAL-2236_filtercolumns_seqassoc' into develop
Jim Procter [Thu, 29 Sep 2016 10:58:24 +0000 (11:58 +0100)]
JAL-2236 include associated sequence id for annotation’s label in filter/select combobox
Jim Procter [Thu, 29 Sep 2016 10:53:51 +0000 (11:53 +0100)]
Merge branch 'patch/JAL-2238_tcoffee_subgroups' into develop
Jim Procter [Thu, 29 Sep 2016 10:53:21 +0000 (11:53 +0100)]
JAL-2236 fix: bail if no context available for subgroup
gmungoc [Thu, 29 Sep 2016 10:03:27 +0000 (11:03 +0100)]
JAL-2047 allow title to be shrunk; spelling fix
gmungoc [Thu, 29 Sep 2016 09:57:08 +0000 (10:57 +0100)]
JAL-1544 typo
gmungoc [Thu, 29 Sep 2016 09:30:19 +0000 (10:30 +0100)]
JAL-1903 increase REST reply timeout from 5 to 15 seconds