jalview.git
8 years agoJAL-2154 updated testMakeCDSAlignment for expected propagate CDS behaviour (ahem...
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!)

8 years agoJAL-2154 propagate from contig to CDS after constructing CDS sequence, and only propa...
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

8 years agoJAL-2154 should only add mappings between dataset sequences
Jim Procter [Tue, 23 Aug 2016 17:40:19 +0000 (18:40 +0100)]
JAL-2154 should only add mappings between dataset sequences

8 years agoJAL-2154 - only copy DBRef from contig to new CDS sequence which involve same mapped...
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

8 years agoMerge branch 'develop' into bug/JAL-2154projectMappings
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

8 years agoJAL-2174 markColumns() refactored inside ColumnSelection
gmungoc [Tue, 23 Aug 2016 08:16:51 +0000 (09:16 +0100)]
JAL-2174 markColumns() refactored inside ColumnSelection

8 years agoJAL-2154 - rejig test pass code for breadth-first (or top down) repetition of fetch...
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.

8 years agoJAL-1448 corrected for backwards compatibility for UK locale users
gmungoc [Mon, 22 Aug 2016 15:21:38 +0000 (16:21 +0100)]
JAL-1448 corrected for backwards compatibility for UK locale users

8 years agoJAL-2175 code tidying
gmungoc [Mon, 22 Aug 2016 14:39:43 +0000 (15:39 +0100)]
JAL-2175 code tidying

8 years agoJAL-2175 code/test fixes/tidy for PFAM/MSF/JSON roundtrip
gmungoc [Mon, 22 Aug 2016 14:38:54 +0000 (15:38 +0100)]
JAL-2175 code/test fixes/tidy for PFAM/MSF/JSON roundtrip

8 years agoJAL-2154 verify recovered xref sequence not already in dataset before adding it
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

8 years agoJAL-2154 regression warning - should never recover a sequence ‘like’ an xref’s mappin...
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!

8 years agoJAL-2154 always check dataset sequence for sequence instance exists in dataset before...
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()

8 years agoJAL-2154 patch verifyAlignment so it fails for duplicate entries for same SequenceI...
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

8 years agoJAL-2154 tidy assert messages and fix test to verify asserts were raised when expected
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

8 years agoJAL-2154 test that verifyAlignment fails for duplicate entries for same SequenceI...
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

8 years agoJAL-2011 adjust method to fix failing unit test
gmungoc [Mon, 22 Aug 2016 08:26:41 +0000 (09:26 +0100)]
JAL-2011 adjust method to fix failing unit test

8 years agoJAL-2174 bug fixes + refactoring to allow + unit tests
gmungoc [Fri, 19 Aug 2016 15:52:22 +0000 (16:52 +0100)]
JAL-2174 bug fixes + refactoring to allow + unit tests

8 years agoJAL-2154 - possible patch .. but leads to new stringify difference:
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

8 years agoJAL-2154 major rejigging of test looping again
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)

8 years agoJAL-2154 disable DAS sources for Jalview2XML tests
Jim Procter [Fri, 19 Aug 2016 15:24:33 +0000 (16:24 +0100)]
JAL-2154 disable DAS sources for Jalview2XML tests

8 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Fri, 19 Aug 2016 14:13:10 +0000 (15:13 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

8 years agoJAL-1803 unit test for PDB chainCode save/restore from Jalview project
tcofoegbu [Fri, 19 Aug 2016 14:13:01 +0000 (15:13 +0100)]
JAL-1803 unit test for PDB chainCode save/restore from Jalview project

8 years agoJAL-2154 fix looping structure so for a particular pass (either 2-pass: retrieve...
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.

8 years agoJAL-2154 drop unused hashes
Jim Procter [Fri, 19 Aug 2016 10:55:02 +0000 (11:55 +0100)]
JAL-2154 drop unused hashes

8 years agoJAL-2154 testNG like assertAlignmentDatasetRefs static wrappers and allow a message...
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

8 years agoJAL-2154 reorder the dataset sequences according to the dataset XML doc (which, perve...
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)

8 years agoJAL-2154 belt-and-braces patch:
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.

8 years agoJAL-2154 verify mapping’s sequenceI ref has been resolved for AlignedCodonFrame forwa...
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

8 years agoJAL-2154 use right reference string for recovering saved project
Jim Procter [Fri, 19 Aug 2016 10:11:04 +0000 (11:11 +0100)]
JAL-2154 use right reference string for recovering saved project

8 years agoJAL-2154 refactor setSequenceAt to replaceSequenceAt, fixed implementation and docs
Jim Procter [Fri, 19 Aug 2016 10:10:04 +0000 (11:10 +0100)]
JAL-2154 refactor setSequenceAt to replaceSequenceAt, fixed implementation and docs

8 years agoJAL-2077 using Platform method to check for Ctrl-down
gmungoc [Thu, 18 Aug 2016 15:20:50 +0000 (16:20 +0100)]
JAL-2077 using Platform method to check for Ctrl-down

8 years agoJAL-1445 status message '...not containing...' for inverted selection
gmungoc [Thu, 18 Aug 2016 15:19:01 +0000 (16:19 +0100)]
JAL-1445 status message '...not containing...' for inverted selection

8 years agoJAL-1693 show warning dialog if unable to make CDS for split frame
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

8 years agoJAL-1855 fail gracefully if XML has no <sequence> element
gmungoc [Thu, 18 Aug 2016 14:25:52 +0000 (15:25 +0100)]
JAL-1855 fail gracefully if XML has no <sequence> element

8 years agoJAL-2077 handling Cmd-click in scale panel for Mac / Windows
gmungoc [Thu, 18 Aug 2016 10:08:23 +0000 (11:08 +0100)]
JAL-2077 handling Cmd-click in scale panel for Mac / Windows

8 years agoJAL-2001 return copy of selection in getSelected()
gmungoc [Thu, 18 Aug 2016 09:42:28 +0000 (10:42 +0100)]
JAL-2001 return copy of selection in getSelected()

8 years agoJAL-2146 status message now with formatted residue name / code
gmungoc [Wed, 17 Aug 2016 13:55:26 +0000 (14:55 +0100)]
JAL-2146 status message now with formatted residue name / code

8 years agoJAL-2173 don't remove annotation from hidden columns
gmungoc [Wed, 17 Aug 2016 11:30:57 +0000 (12:30 +0100)]
JAL-2173 don't remove annotation from hidden columns

8 years agoJAL-2172 reverted to not sorting column selection
gmungoc [Wed, 17 Aug 2016 11:22:19 +0000 (12:22 +0100)]
JAL-2172 reverted to not sorting column selection

8 years agoJAL-2105 rest versions updated to 4.6, change log link added
gmungoc [Wed, 17 Aug 2016 11:16:43 +0000 (12:16 +0100)]
JAL-2105 rest versions updated to 4.6, change log link added

8 years agoJAL-2172 handle case where column selection is not ordered
gmungoc [Wed, 17 Aug 2016 10:06:04 +0000 (11:06 +0100)]
JAL-2172 handle case where column selection is not ordered

8 years agoJAL-2154 verify sequenceI/dataset refs for codonmappings
Jim Procter [Tue, 16 Aug 2016 17:39:32 +0000 (18:39 +0100)]
JAL-2154 verify sequenceI/dataset refs for codonmappings

8 years agoJAL-2154 make sure any new sequences via DBRefEntry->Mapping->To are added to dataset...
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.

8 years agoJAL-2154 check alignment isn’t null before validating
Jim Procter [Tue, 16 Aug 2016 14:30:40 +0000 (15:30 +0100)]
JAL-2154 check alignment isn’t null before validating

8 years agoJAL-2154 always resolve dataset sequences when creating a mapping for a DBRefEntry
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

8 years agoJAL-2154 [test] verify reference integrity for alignment/dataset after each retrieval...
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

8 years agoJAL-2172 unit test added
gmungoc [Tue, 16 Aug 2016 15:52:03 +0000 (16:52 +0100)]
JAL-2172 unit test added

8 years agoJAL-2154 formatting
Jim Procter [Tue, 16 Aug 2016 13:31:37 +0000 (14:31 +0100)]
JAL-2154 formatting

8 years agoJAL-2154 new assert to check reference integrity for an alignment, and a dataset...
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

8 years agoJAL-2154 xref test harness - test fails if there are differences between dataset...
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 !

8 years agoJAL-1128 fix for truncated bottom boarder pixels in figures generated from wrapped...
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

8 years agoJAL-1128 fix for truncated bottom boarder pixels in figures generated from wrapped...
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

8 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

8 years agoJAL-1919 Added improvement to ensure consistence of annotations parsed via JmolParser...
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

8 years agoJAL-2154 refactor CrossRef UI code to its own class
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

8 years agoJAL-2154 check if the desktop is constructed before trying to clear it !
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 !

8 years agoJAL-2154 ignore all but the primary source resolved during programmatic invocation
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

8 years agoJAL-2154 make sure we wait for constructor thread to finish
Jim Procter [Sat, 13 Aug 2016 15:29:09 +0000 (16:29 +0100)]
JAL-2154 make sure we wait for constructor thread to finish

8 years agoJAL-2154 clear the desktop before every 2xml test
Jim Procter [Thu, 11 Aug 2016 20:36:09 +0000 (21:36 +0100)]
JAL-2154 clear the desktop before every 2xml test

8 years agoJAL-2154 jalview.gui.SequenceFetcher.fetchAndShow(db,query) entry point for programma...
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

8 years agoJAL-2154 JAL-1993 relocate show dbchooser action out of jbInit
Jim Procter [Thu, 11 Aug 2016 17:25:03 +0000 (18:25 +0100)]
JAL-2154 JAL-1993 relocate show dbchooser action out of jbInit

8 years agoJAL-2154 refactor setup/teardown from Jalview2xml for other 2xml related tests
Jim Procter [Thu, 11 Aug 2016 13:39:39 +0000 (14:39 +0100)]
JAL-2154 refactor setup/teardown from Jalview2xml for other 2xml related tests

8 years agoJAL-2124 i18n of 'All' menu item
gmungoc [Wed, 10 Aug 2016 10:41:20 +0000 (11:41 +0100)]
JAL-2124 i18n of 'All' menu item

8 years agoJAL-2124 i18n of "All" menu item
gmungoc [Wed, 10 Aug 2016 10:37:01 +0000 (11:37 +0100)]
JAL-2124 i18n of "All" menu item

8 years agoJAL-2146 small optimisation (avoid String creation)
gmungoc [Wed, 10 Aug 2016 10:34:31 +0000 (11:34 +0100)]
JAL-2146 small optimisation (avoid String creation)

8 years agoJAL-2146 show Column no [Sequence no [Residue / pos]] on mouseover
gmungoc [Wed, 10 Aug 2016 10:33:10 +0000 (11:33 +0100)]
JAL-2146 show Column no [Sequence no [Residue / pos]] on mouseover

8 years agoJAL-1577 rebuild menus when secondary structure manually updated
gmungoc [Mon, 8 Aug 2016 16:16:36 +0000 (17:16 +0100)]
JAL-1577 rebuild menus when secondary structure manually updated

8 years agoreplaced broken biojsmsa home link in jalveiw help
tcofoegbu [Mon, 8 Aug 2016 15:01:32 +0000 (16:01 +0100)]
replaced broken biojsmsa home link in jalveiw help

8 years agoJAL-2119 replaced link with a non-404 alternative
gmungoc [Mon, 8 Aug 2016 13:42:30 +0000 (14:42 +0100)]
JAL-2119 replaced link with a non-404 alternative

8 years agoJAL-2168 -nonews option also mentioned here
gmungoc [Mon, 8 Aug 2016 13:25:09 +0000 (14:25 +0100)]
JAL-2168 -nonews option also mentioned here

8 years agoJAL-2119 updates to invalid / obsolete help links
gmungoc [Mon, 8 Aug 2016 13:20:56 +0000 (14:20 +0100)]
JAL-2119 updates to invalid / obsolete help links

8 years agoJAL-2168 document '-nonews' parameter
gmungoc [Mon, 8 Aug 2016 13:16:44 +0000 (14:16 +0100)]
JAL-2168 document '-nonews' parameter

8 years agoJAL-2154 add in missing class for createDatasetAlignment(), and add support for recov...
Jim Procter [Sun, 7 Aug 2016 15:13:43 +0000 (16:13 +0100)]
JAL-2154 add in missing class for createDatasetAlignment(), and add support for recovering position for an object in the set.

8 years agoJAL-2168 skip news feed if parameter "-nonews" is supplied
gmungoc [Fri, 5 Aug 2016 13:53:23 +0000 (14:53 +0100)]
JAL-2168 skip news feed if parameter "-nonews" is supplied

8 years agoJAL-1448 always use UK locale for formatted date properties
gmungoc [Fri, 5 Aug 2016 13:11:43 +0000 (14:11 +0100)]
JAL-1448 always use UK locale for formatted date properties

8 years agoJAL-2164 add transferred annotation to sequence
gmungoc [Fri, 5 Aug 2016 10:22:14 +0000 (11:22 +0100)]
JAL-2164 add transferred annotation to sequence

8 years agoJAL-2154 make sure codon mappings between sequences discovered via database cross...
Jim Procter [Thu, 4 Aug 2016 19:59:46 +0000 (20:59 +0100)]
JAL-2154 make sure codon mappings between sequences discovered via database cross-reference matching are added to the codonframe.

8 years agoJAL-2154 todo
Jim Procter [Thu, 4 Aug 2016 19:58:38 +0000 (20:58 +0100)]
JAL-2154 todo

8 years agoJAL-2154 use convenience method
Jim Procter [Thu, 4 Aug 2016 19:58:16 +0000 (20:58 +0100)]
JAL-2154 use convenience method

8 years agoJAL-2154 make sure all sequences referenced via DBRefEntry->getMap()->getTo() are...
Jim Procter [Thu, 4 Aug 2016 19:57:33 +0000 (20:57 +0100)]
JAL-2154 make sure all sequences referenced via DBRefEntry->getMap()->getTo() are added to dataset when it is created

8 years agoJAL-2110 comment on failing test (consider skipping for release ?)
Jim Procter [Thu, 4 Aug 2016 19:55:28 +0000 (20:55 +0100)]
JAL-2110 comment on failing test (consider skipping for release ?)

8 years agoJAL-2154 test for CDS->protein map
Jim Procter [Thu, 4 Aug 2016 19:54:57 +0000 (20:54 +0100)]
JAL-2154 test for CDS->protein map

8 years agoJAL-2046 stack trace for implementation warning
Jim Procter [Thu, 4 Aug 2016 19:53:40 +0000 (20:53 +0100)]
JAL-2046 stack trace for implementation warning

8 years agoJAL-2164 changed to be Java 1.7 compliant
gmungoc [Thu, 4 Aug 2016 14:35:18 +0000 (15:35 +0100)]
JAL-2164 changed to be Java 1.7 compliant

8 years agoJAL-2008 handle fast mouse drag of feature ordering correctly
gmungoc [Thu, 4 Aug 2016 09:55:50 +0000 (10:55 +0100)]
JAL-2008 handle fast mouse drag of feature ordering correctly

8 years agoJAL-2015 convert Color from colour picker to FeatureColour
gmungoc [Thu, 4 Aug 2016 09:11:06 +0000 (10:11 +0100)]
JAL-2015 convert Color from colour picker to FeatureColour

8 years agoJAL-2046 additional logic to suppress spurious implementation-error warnings
Jim Procter [Tue, 2 Aug 2016 15:22:43 +0000 (16:22 +0100)]
JAL-2046 additional logic to suppress spurious implementation-error warnings

8 years agoMerge branch 'efficiency/JAL-2034_JAL-1421' into develop
Jim Procter [Tue, 2 Aug 2016 14:56:19 +0000 (15:56 +0100)]
Merge branch 'efficiency/JAL-2034_JAL-1421' into develop

8 years agoJAL-2034 show greyed out image during overview update
Jim Procter [Tue, 2 Aug 2016 14:46:58 +0000 (15:46 +0100)]
JAL-2034 show greyed out image during overview update

8 years agoMerge branch 'develop' into efficiency/JAL-2034_JAL-1421
Jim Procter [Tue, 2 Aug 2016 13:16:06 +0000 (14:16 +0100)]
Merge branch 'develop' into efficiency/JAL-2034_JAL-1421

8 years agoJAL-2068 reinstated false return value for notifyWorking
Jim Procter [Tue, 2 Aug 2016 13:15:35 +0000 (14:15 +0100)]
JAL-2068 reinstated false return value for notifyWorking
  (prevents multiple worker threads starting when new view created)
 * documentation for AlignCalcManagerI

8 years agoMerge branch 'develop' into efficiency/JAL-2034_JAL-1421
Jim Procter [Tue, 2 Aug 2016 10:05:53 +0000 (11:05 +0100)]
Merge branch 'develop' into efficiency/JAL-2034_JAL-1421

8 years agoJAL-2164 TODO: make test pass for JMOL_PARSER
Jim Procter [Mon, 1 Aug 2016 20:13:52 +0000 (21:13 +0100)]
JAL-2164 TODO: make test pass for JMOL_PARSER

8 years agoJAL-2164 JAL-1919 JAL-1270 use structure import settings to properly configure for...
Jim Procter [Mon, 1 Aug 2016 20:13:22 +0000 (21:13 +0100)]
JAL-2164 JAL-1919 JAL-1270 use structure import settings to properly configure for test

8 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Mon, 1 Aug 2016 19:16:42 +0000 (20:16 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

8 years agoJAL-2164 bugfix to convert insCodes of '\000' to ' ' in JmolParser, this fixes the...
tcofoegbu [Mon, 1 Aug 2016 16:21:08 +0000 (17:21 +0100)]
JAL-2164 bugfix to convert insCodes of '\000' to ' ' in JmolParser, this fixes the xml marshalling bug

8 years agoMerge branch 'bug/JAL-2154projectMappings' into develop
Jim Procter [Mon, 1 Aug 2016 14:40:24 +0000 (15:40 +0100)]
Merge branch 'bug/JAL-2154projectMappings' into develop

8 years agoMerge branch 'task/JAL-2164_mcviewforoldjalviewprojects' into develop
Jim Procter [Mon, 1 Aug 2016 13:00:19 +0000 (14:00 +0100)]
Merge branch 'task/JAL-2164_mcviewforoldjalviewprojects' into develop

8 years agoJAL-2164 prevent jalview news from opening task/JAL-2164_mcviewforoldjalviewprojects
Jim Procter [Mon, 1 Aug 2016 12:46:09 +0000 (13:46 +0100)]
JAL-2164 prevent jalview news from opening