Jim Procter [Thu, 25 Aug 2016 11:12:06 +0000 (12:12 +0100)]
Merge branch 'refactor/JAL-2106_sourceDbRef_revision' into trailm
Jim Procter [Thu, 25 Aug 2016 11:10:25 +0000 (12:10 +0100)]
Merge branch 'develop' into bug/JAL-2154projectMappings
Conflicts:
src/jalview/gui/AlignFrame.java - propagated MessageManager tweak to jalview/gui/CrossRefAction.java
Jim Procter [Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)]
Merge branch 'develop' into refactor/JAL-2106_sourceDbRef_revision
gmungoc [Thu, 25 Aug 2016 08:22:25 +0000 (09:22 +0100)]
JAL-2178 remove duplicate Uniprot db source
gmungoc [Thu, 25 Aug 2016 07:59:59 +0000 (08:59 +0100)]
JAL-1424 duplicate key removed
Jim Procter [Wed, 24 Aug 2016 16:37:54 +0000 (17:37 +0100)]
JAL-2106 FIXME for test failure
Jim Procter [Wed, 24 Aug 2016 16:31:31 +0000 (17:31 +0100)]
JAL-2106 TODO - verify Embl primary refs get added
Jim Procter [Wed, 24 Aug 2016 16:29:55 +0000 (17:29 +0100)]
JAL-2106 tidy up and comments for DBRefFetcher
Jim Procter [Wed, 24 Aug 2016 16:29:27 +0000 (17:29 +0100)]
JAL-2106 javadoc for sifts mapping method
Jim Procter [Wed, 24 Aug 2016 16:29:13 +0000 (17:29 +0100)]
JAL-2106 prevent SIFTS mappings for sequences that don’t look like protein
Jim Procter [Wed, 24 Aug 2016 16:28:30 +0000 (17:28 +0100)]
JAL-2106 removed setSourceDBRef, refactor getSourceDBRef to getPrimaryDBRefs
* minimal test for PDB cornercase
* minimal revision of AlignmentUtils/Tests, CrossRef
* basic patch to SIFTSClient - need to revisit
TODO
* jalview.io.StructureFile re ‘PDB’ primary dbrefs generated from filenames.
* verify primary refs added correctly for Uniprot, EMBL, Ensembl and EnsemblGenomes in their unit tests.
Jim Procter [Wed, 24 Aug 2016 15:47:35 +0000 (16:47 +0100)]
JAL-2106 stricter check for 1:1 mapping (same numbering on both sides, and word size == 1)
Jim Procter [Wed, 24 Aug 2016 15:46:30 +0000 (16:46 +0100)]
JAL-2106 rejig test to minimally verify patch that getPDBEntry can be called on local and dataset sequence
Jim Procter [Wed, 24 Aug 2016 14:44:21 +0000 (15:44 +0100)]
JAL-2106 formatting
Jim Procter [Wed, 24 Aug 2016 14:43:43 +0000 (15:43 +0100)]
JAL-2106 DBRefEntry.isPrimary() minimal test & implementation
Jim Procter [Wed, 24 Aug 2016 14:45:11 +0000 (15:45 +0100)]
JAL-2106 convenience method to find all dbsource names via reflection
gmungoc [Wed, 24 Aug 2016 13:39:05 +0000 (14:39 +0100)]
JAL-1355 correct 'thereshold' to 'threshold' in message keys
gmungoc [Wed, 24 Aug 2016 13:31:37 +0000 (14:31 +0100)]
JAL-1424 removed unused and duplicated message keys
gmungoc [Wed, 24 Aug 2016 13:27:22 +0000 (14:27 +0100)]
JAL-1424 tidy / recode MessageManager calls to support code analysis
gmungoc [Wed, 24 Aug 2016 13:24:20 +0000 (14:24 +0100)]
JAL-1854 removed pointless method override
gmungoc [Wed, 24 Aug 2016 13:23:04 +0000 (14:23 +0100)]
JAL-1424 removed two redundant (overwritten) setText() calls
gmungoc [Wed, 24 Aug 2016 13:22:12 +0000 (14:22 +0100)]
JAL-1424 corrected Message bundle lookup key
gmungoc [Wed, 24 Aug 2016 13:21:10 +0000 (14:21 +0100)]
JAL-1424 undo i18n of exception message
gmungoc [Wed, 24 Aug 2016 13:19:34 +0000 (14:19 +0100)]
JAL-1854 declare immutable class as final
gmungoc [Wed, 24 Aug 2016 13:15:05 +0000 (14:15 +0100)]
JAL-1424 recode calls to MessageManager to allow code inspection
gmungoc [Wed, 24 Aug 2016 13:07:26 +0000 (14:07 +0100)]
JAL-2151 port fix to applet
gmungoc [Wed, 24 Aug 2016 13:05:39 +0000 (14:05 +0100)]
JAL-1424 enhanced for cleaner reporting, checks calls to JvSwingUtils
gmungoc [Wed, 24 Aug 2016 09:34:04 +0000 (10:34 +0100)]
JAL-1424 also report (obsolete) keys in translated bundle not in default
Jim Procter [Tue, 23 Aug 2016 17:46:38 +0000 (18:46 +0100)]
JAL-2154 updated testMakeCDSAlignment for expected propagate CDS behaviour (ahem - this should have been checked in *before* implementation!)
Jim Procter [Tue, 23 Aug 2016 17:42:53 +0000 (18:42 +0100)]
JAL-2154 propagate from contig to CDS after constructing CDS sequence, and only propagate refs with congruent mappings *and* corresponding mapping on protein product
Jim Procter [Tue, 23 Aug 2016 17:40:19 +0000 (18:40 +0100)]
JAL-2154 should only add mappings between dataset sequences
Jim Procter [Tue, 23 Aug 2016 16:44:39 +0000 (17:44 +0100)]
JAL-2154 - only copy DBRef from contig to new CDS sequence which involve same mapped region
Jim Procter [Tue, 23 Aug 2016 10:17:42 +0000 (11:17 +0100)]
Merge branch 'develop' into bug/JAL-2154projectMappings
Conflicts:
src/jalview/gui/AlignFrame.java
- pushed raise warning dialog to CrossRefAction
test/jalview/analysis/AlignmentUtilsTests.java
- simple merge
test/jalview/io/Jalview2xmlTests.java
- pushed updated BeforeClass setup to Jalview2xmlBase
gmungoc [Tue, 23 Aug 2016 09:41:15 +0000 (10:41 +0100)]
JAL-2176 unused field / methods removed
gmungoc [Tue, 23 Aug 2016 08:16:51 +0000 (09:16 +0100)]
JAL-2174 markColumns() refactored inside ColumnSelection
Jim Procter [Mon, 22 Aug 2016 15:42:53 +0000 (16:42 +0100)]
JAL-2154 - rejig test pass code for breadth-first (or top down) repetition of fetch/fetch crossref/fetch crossref.
* First iteration, all pass counters at zero, process through all crossrefs.
* Next iteration, pass1=1 - recover, process through all crossers
* Next iteration, pass2=1 - recover each first crossref result and process through
* Last iteration, pass3=1 - recover each second crossref result and process.
gmungoc [Mon, 22 Aug 2016 15:21:38 +0000 (16:21 +0100)]
JAL-1448 corrected for backwards compatibility for UK locale users
gmungoc [Mon, 22 Aug 2016 14:39:43 +0000 (15:39 +0100)]
JAL-2175 code tidying
gmungoc [Mon, 22 Aug 2016 14:38:54 +0000 (15:38 +0100)]
JAL-2175 code/test fixes/tidy for PFAM/MSF/JSON roundtrip
Jim Procter [Mon, 22 Aug 2016 12:01:35 +0000 (13:01 +0100)]
JAL-2154 verify recovered xref sequence not already in dataset before adding it
Jim Procter [Mon, 22 Aug 2016 12:00:07 +0000 (13:00 +0100)]
JAL-2154 regression warning - should never recover a sequence ‘like’ an xref’s mapping.getTo() sequence!
Jim Procter [Mon, 22 Aug 2016 11:55:36 +0000 (12:55 +0100)]
JAL-2154 always check dataset sequence for sequence instance exists in dataset before adding it in AlignmentI.addSequence()
Jim Procter [Mon, 22 Aug 2016 10:54:02 +0000 (11:54 +0100)]
JAL-2154 patch verifyAlignment so it fails for duplicate entries for same SequenceI instance on alignment
Jim Procter [Mon, 22 Aug 2016 10:53:13 +0000 (11:53 +0100)]
JAL-2154 tidy assert messages and fix test to verify asserts were raised when expected
Jim Procter [Mon, 22 Aug 2016 10:40:46 +0000 (11:40 +0100)]
JAL-2154 test that verifyAlignment fails for duplicate entries for same SequenceI instance on alignment
gmungoc [Mon, 22 Aug 2016 08:26:41 +0000 (09:26 +0100)]
JAL-2011 adjust method to fix failing unit test
gmungoc [Fri, 19 Aug 2016 15:52:22 +0000 (16:52 +0100)]
JAL-2174 bug fixes + refactoring to allow + unit tests
Jim Procter [Fri, 19 Aug 2016 15:47:13 +0000 (16:47 +0100)]
JAL-2154 - possible patch .. but leads to new stringify difference:
expected to see below in dataset, but it doesn’t appear in recovered:
>ENSMUSP00000131873/1-222 ENSEMBL (Protein)
MASPLTRFLSLNLLLLGESIILGSGEAKPQAPELRIFPKKMDAELGQKVDLVCEVLGSVSQGCSWLFQNSSS
KLPQPTFVVYMASSHNKITWDEKLNSSKLFSAMRDTNNKYVLTLNKFSKENEGYYFCSVISNSVMYFSSVVP
VLQKVNSTTTKPVLRTPSPVHPTGTSQPQRPEDCRPRGSVKGTGLDFACDIYIWAPLAGICVALLLSLIITL
ICYHSR
This is actually a duplicate sequence in dataset.. so difference may be due to normalisation when project file is written out
Jim Procter [Fri, 19 Aug 2016 15:26:07 +0000 (16:26 +0100)]
JAL-2154 major rejigging of test looping again
probably not 100% correct, but now fails when:
Recovered view for 'UNIPROT P01731 -> EMBL{1} -> ENSEMBL{0}' from '/var/folders/km/m8_86nbd4bbcpd5s2h8xqtk4_kj190/T/crossRefTest9144214145355720129.jvp'
Cause is:
Parsing as Jalview Version 2 file failed.
java.lang.ArrayIndexOutOfBoundsException: 73
at jalview.gui.Jalview2XML.loadFromObject(Jalview2XML.java:2827)
at jalview.gui.Jalview2XML.loadJalviewAlign(Jalview2XML.java:2390)
at jalview.gui.Jalview2XML.loadJalviewAlign(Jalview2XML.java:2277)
at jalview.io.FileLoader.run(FileLoader.java:308)
at java.lang.Thread.run(Thread.java:745)
Jim Procter [Fri, 19 Aug 2016 15:24:33 +0000 (16:24 +0100)]
JAL-2154 disable DAS sources for Jalview2XML tests
tcofoegbu [Fri, 19 Aug 2016 14:13:10 +0000 (15:13 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Fri, 19 Aug 2016 14:13:01 +0000 (15:13 +0100)]
JAL-1803 unit test for PDB chainCode save/restore from Jalview project
Jim Procter [Fri, 19 Aug 2016 10:57:00 +0000 (11:57 +0100)]
JAL-2154 fix looping structure so for a particular pass (either 2-pass: retrieve cross-ref+save/recover from project or one pass: retrieve cross-ref and compare string) we do all cross-refs or dbfetches in a pass.
Jim Procter [Fri, 19 Aug 2016 10:55:02 +0000 (11:55 +0100)]
JAL-2154 drop unused hashes
Jim Procter [Fri, 19 Aug 2016 10:52:25 +0000 (11:52 +0100)]
JAL-2154 testNG like assertAlignmentDatasetRefs static wrappers and allow a message to be passed to prefix any assert failed messages
Jim Procter [Fri, 19 Aug 2016 10:18:56 +0000 (11:18 +0100)]
JAL-2154 reorder the dataset sequences according to the dataset XML doc (which, perversely, is read after all views)
Jim Procter [Fri, 19 Aug 2016 10:18:11 +0000 (11:18 +0100)]
JAL-2154 belt-and-braces patch:
* when dataset XML doc is read in, all vamsasSet sequences should be processed in sync with the ‘view’ JSeq entries containing start/end metadata
* features, dbrefs and pdbentrys are now added direct to dataset sequences, but old behaviour should be preserved for reading alignment views containing dbrefs that get propagated to dataset.
Jim Procter [Fri, 19 Aug 2016 10:12:28 +0000 (11:12 +0100)]
JAL-2154 verify mapping’s sequenceI ref has been resolved for AlignedCodonFrame forward refs
Jim Procter [Fri, 19 Aug 2016 10:11:04 +0000 (11:11 +0100)]
JAL-2154 use right reference string for recovering saved project
Jim Procter [Fri, 19 Aug 2016 10:10:04 +0000 (11:10 +0100)]
JAL-2154 refactor setSequenceAt to replaceSequenceAt, fixed implementation and docs
gmungoc [Thu, 18 Aug 2016 15:33:06 +0000 (16:33 +0100)]
Merge branch 'develop' into bug/JAL-1841rnaSecStr
gmungoc [Thu, 18 Aug 2016 15:20:50 +0000 (16:20 +0100)]
JAL-2077 using Platform method to check for Ctrl-down
gmungoc [Thu, 18 Aug 2016 15:19:01 +0000 (16:19 +0100)]
JAL-1445 status message '...not containing...' for inverted selection
gmungoc [Thu, 18 Aug 2016 15:16:27 +0000 (16:16 +0100)]
JAL-1693 show warning dialog if unable to make CDS for split frame
gmungoc [Thu, 18 Aug 2016 14:25:52 +0000 (15:25 +0100)]
JAL-1855 fail gracefully if XML has no <sequence> element
gmungoc [Thu, 18 Aug 2016 10:08:23 +0000 (11:08 +0100)]
JAL-2077 handling Cmd-click in scale panel for Mac / Windows
gmungoc [Thu, 18 Aug 2016 09:42:28 +0000 (10:42 +0100)]
JAL-2001 return copy of selection in getSelected()
gmungoc [Wed, 17 Aug 2016 13:55:26 +0000 (14:55 +0100)]
JAL-2146 status message now with formatted residue name / code
gmungoc [Wed, 17 Aug 2016 11:30:57 +0000 (12:30 +0100)]
JAL-2173 don't remove annotation from hidden columns
gmungoc [Wed, 17 Aug 2016 11:22:19 +0000 (12:22 +0100)]
JAL-2172 reverted to not sorting column selection
gmungoc [Wed, 17 Aug 2016 11:16:43 +0000 (12:16 +0100)]
JAL-2105 rest versions updated to 4.6, change log link added
gmungoc [Wed, 17 Aug 2016 10:06:04 +0000 (11:06 +0100)]
JAL-2172 handle case where column selection is not ordered
Jim Procter [Tue, 16 Aug 2016 17:39:32 +0000 (18:39 +0100)]
JAL-2154 verify sequenceI/dataset refs for codonmappings
Jim Procter [Tue, 16 Aug 2016 14:31:33 +0000 (15:31 +0100)]
JAL-2154 make sure any new sequences via DBRefEntry->Mapping->To are added to dataset as cross-refs are resolved.
Jim Procter [Tue, 16 Aug 2016 14:30:40 +0000 (15:30 +0100)]
JAL-2154 check alignment isn’t null before validating
Jim Procter [Tue, 16 Aug 2016 14:15:15 +0000 (15:15 +0100)]
JAL-2154 always resolve dataset sequences when creating a mapping for a DBRefEntry
Jim Procter [Tue, 16 Aug 2016 13:41:35 +0000 (14:41 +0100)]
JAL-2154 [test] verify reference integrity for alignment/dataset after each retrieval/crossref view
gmungoc [Tue, 16 Aug 2016 15:52:37 +0000 (16:52 +0100)]
Merge branch 'develop' into bug/JAL-1841rnaSecStr
gmungoc [Tue, 16 Aug 2016 15:52:03 +0000 (16:52 +0100)]
JAL-2172 unit test added
gmungoc [Tue, 16 Aug 2016 15:49:47 +0000 (16:49 +0100)]
JAL-2171 matching bracket default character for rna SS entry
Jim Procter [Tue, 16 Aug 2016 13:31:37 +0000 (14:31 +0100)]
JAL-2154 formatting
Jim Procter [Tue, 16 Aug 2016 13:30:48 +0000 (14:30 +0100)]
JAL-2154 new assert to check reference integrity for an alignment, and a dataset, and associated DBRefEntry mappings to other sequences
Jim Procter [Tue, 16 Aug 2016 09:39:11 +0000 (10:39 +0100)]
JAL-2154 xref test harness - test fails if there are differences between dataset/alignment/codonframes for views created from a sequence of cross-ref actions, and the same views after restoring from a jalview project.
Currently fails !
gmungoc [Tue, 16 Aug 2016 07:55:26 +0000 (08:55 +0100)]
Merge branch 'develop' into bug/JAL-1841rnaSecStr
gmungoc [Mon, 15 Aug 2016 15:57:06 +0000 (16:57 +0100)]
JAL-1841 better i18n text
tcofoegbu [Mon, 15 Aug 2016 15:54:17 +0000 (16:54 +0100)]
JAL-1128 fix for truncated bottom boarder pixels in figures generated from wrapped alignment
tcofoegbu [Mon, 15 Aug 2016 15:46:00 +0000 (16:46 +0100)]
JAL-1128 fix for truncated bottom boarder pixels in figures generated from wrapped alignment
tcofoegbu [Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Mon, 15 Aug 2016 13:53:58 +0000 (14:53 +0100)]
JAL-1919 Added improvement to ensure consistence of annotations parsed via JmolParser vs PDBfile parser and fixed unit tests accordingly
Jim Procter [Sat, 13 Aug 2016 16:06:25 +0000 (17:06 +0100)]
JAL-2154 refactor CrossRef UI code to its own class
JAL-2154 first pass of cross-ref + project save/restore test
Jim Procter [Sat, 13 Aug 2016 15:59:34 +0000 (16:59 +0100)]
JAL-2154 check if the desktop is constructed before trying to clear it !
Jim Procter [Sat, 13 Aug 2016 15:57:58 +0000 (16:57 +0100)]
JAL-2154 ignore all but the primary source resolved during programmatic invocation
Jim Procter [Sat, 13 Aug 2016 15:29:09 +0000 (16:29 +0100)]
JAL-2154 make sure we wait for constructor thread to finish
gmungoc [Fri, 12 Aug 2016 13:49:08 +0000 (14:49 +0100)]
JAL-1841 count (logo height) is valid pairs only; detect base-gap pair
gmungoc [Fri, 12 Aug 2016 10:33:55 +0000 (11:33 +0100)]
JAL-1841 bug fixes / code tidy for rna SS rendering / parsing
gmungoc [Fri, 12 Aug 2016 10:32:10 +0000 (11:32 +0100)]
JAL-1841, bug fix in rna SS consensus, additions to Rna[Test]
gmungoc [Fri, 12 Aug 2016 09:51:48 +0000 (10:51 +0100)]
JAL-2171 default SS symbol to existing (if present)
Jim Procter [Thu, 11 Aug 2016 20:36:09 +0000 (21:36 +0100)]
JAL-2154 clear the desktop before every 2xml test
Jim Procter [Thu, 11 Aug 2016 20:32:56 +0000 (21:32 +0100)]
JAL-2154 jalview.gui.SequenceFetcher.fetchAndShow(db,query) entry point for programmatically triggering a sequence fetch
Jim Procter [Thu, 11 Aug 2016 17:25:03 +0000 (18:25 +0100)]
JAL-2154 JAL-1993 relocate show dbchooser action out of jbInit