jalview.git
7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications features/JAL-2110_crossRefDuplications
gmungoc [Sat, 9 Jul 2016 06:12:09 +0000 (07:12 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-1919 Fixed failing tests, enabled HETATM processing from structure file to be...
tcofoegbu [Fri, 8 Jul 2016 16:16:54 +0000 (17:16 +0100)]
JAL-1919 Fixed failing tests, enabled HETATM processing from structure file to be configurable. Minor refactorings (StructureViewSettings class renamed to StructureImportSettings, fileName variables of AlignFile class renamed to dataObject since in realty it could be a file, url or pasted string)

7 years agoJAL-2110 added alignAsSameSequences to handle 'direct' (copy) case
gmungoc [Thu, 7 Jul 2016 15:51:51 +0000 (16:51 +0100)]
JAL-2110 added alignAsSameSequences to handle 'direct' (copy) case

7 years agoJAL-2110 field 'cf' moved to stack
gmungoc [Thu, 7 Jul 2016 15:51:21 +0000 (16:51 +0100)]
JAL-2110 field 'cf' moved to stack

7 years agoJAL-2110 generic rather than specific check for gap character
gmungoc [Wed, 6 Jul 2016 15:34:32 +0000 (16:34 +0100)]
JAL-2110 generic rather than specific check for gap character

7 years agoJAL-2110 AlignmentUtils.alignCdsAsProtein implemented
gmungoc [Wed, 6 Jul 2016 15:34:01 +0000 (16:34 +0100)]
JAL-2110 AlignmentUtils.alignCdsAsProtein implemented

7 years agoJAL-2110 ensuring mapped dbrefs between protein and cds
gmungoc [Wed, 6 Jul 2016 12:08:28 +0000 (13:08 +0100)]
JAL-2110 ensuring mapped dbrefs between protein and cds

7 years agoJAL-2110 add 'mapFromId' to Mapping (for e.g. EMBL CDS protein_id)
gmungoc [Wed, 6 Jul 2016 11:47:04 +0000 (12:47 +0100)]
JAL-2110 add 'mapFromId' to Mapping (for e.g. EMBL CDS protein_id)

7 years agoJAL-2110 cross-refs from protein to show cds not non-coding sequences
gmungoc [Wed, 6 Jul 2016 11:42:11 +0000 (12:42 +0100)]
JAL-2110 cross-refs from protein to show cds not non-coding sequences

7 years agoJAL-2110 fixes and tests for adding dbrefs to EMBL sequence and products
gmungoc [Wed, 6 Jul 2016 09:10:53 +0000 (10:10 +0100)]
JAL-2110 fixes and tests for adding dbrefs to EMBL sequence and products

7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications
gmungoc [Mon, 4 Jul 2016 14:57:01 +0000 (15:57 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-2110 use shared dataset when copying alignment for split frame
gmungoc [Mon, 4 Jul 2016 14:35:13 +0000 (15:35 +0100)]
JAL-2110 use shared dataset when copying alignment for split frame

7 years agoJAL-2110 added another test case (should fail but doesn't)
gmungoc [Mon, 4 Jul 2016 14:34:51 +0000 (15:34 +0100)]
JAL-2110 added another test case (should fail but doesn't)

7 years agoRevert "JAL-2110 use shared alignment dataset when copying alignment for split frame"
gmungoc [Mon, 4 Jul 2016 14:27:21 +0000 (15:27 +0100)]
Revert "JAL-2110 use shared alignment dataset when copying alignment for split frame"

This reverts commit f931c557266d95b3f4ab5b64bd108123c90e85ab.

7 years agoJAL-2110 use shared alignment dataset when copying alignment for split
gmungoc [Mon, 4 Jul 2016 14:21:49 +0000 (15:21 +0100)]
JAL-2110 use shared alignment dataset when copying alignment for split
frame

7 years agoJAL-2110 bug fix / test for searchDataset mappings created
gmungoc [Mon, 4 Jul 2016 14:21:17 +0000 (15:21 +0100)]
JAL-2110 bug fix / test for searchDataset mappings created

7 years agoJAL-2110 unused method removed
gmungoc [Mon, 4 Jul 2016 14:20:27 +0000 (15:20 +0100)]
JAL-2110 unused method removed

7 years agoJAL-2110 defensive check in code
gmungoc [Mon, 4 Jul 2016 14:19:43 +0000 (15:19 +0100)]
JAL-2110 defensive check in code

7 years agoJAL-2110 bug fixing and tidying for get cross-refs
gmungoc [Fri, 1 Jul 2016 15:54:01 +0000 (16:54 +0100)]
JAL-2110 bug fixing and tidying for get cross-refs

7 years agoJAL-2110 set reasonable bounds to initial split of SplitFrame divider
gmungoc [Fri, 1 Jul 2016 14:01:00 +0000 (15:01 +0100)]
JAL-2110 set reasonable bounds to initial split of SplitFrame divider

7 years agoJAL-2135 bugfix for error preventing processing of secondary structure annotation...
tcofoegbu [Fri, 1 Jul 2016 10:08:43 +0000 (11:08 +0100)]
JAL-2135 bugfix for error preventing processing of secondary structure annotation for model produced by Phyre2

7 years agoJAL-2110 add 'products' parameter to filter results in madeCdsAlignment
gmungoc [Fri, 1 Jul 2016 09:19:20 +0000 (10:19 +0100)]
JAL-2110 add 'products' parameter to filter results in madeCdsAlignment

7 years agoJAL-2110 code/comment tidy
gmungoc [Fri, 1 Jul 2016 09:07:31 +0000 (10:07 +0100)]
JAL-2110 code/comment tidy

7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications
gmungoc [Thu, 30 Jun 2016 15:24:19 +0000 (16:24 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-2074 Improvement to StructureChooser and FTS interfaces to remember the user...
tcofoegbu [Thu, 30 Jun 2016 14:59:00 +0000 (15:59 +0100)]
JAL-2074 Improvement to StructureChooser and FTS interfaces to remember the user preferences for summary table columns, window size & positions

7 years agoJAL-2110 fixes and tests for synthesized EMBLCDSPROTEIN dbrefs
gmungoc [Thu, 30 Jun 2016 14:49:51 +0000 (15:49 +0100)]
JAL-2110 fixes and tests for synthesized EMBLCDSPROTEIN dbrefs

7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications
gmungoc [Thu, 30 Jun 2016 13:01:23 +0000 (14:01 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-1919 updated PDBSequenceFetcherTest and JMol parser config settings to enable...
tcofoegbu [Thu, 30 Jun 2016 09:46:51 +0000 (10:46 +0100)]
JAL-1919 updated PDBSequenceFetcherTest and JMol parser config settings to enable proper processing of mmCIF files

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 29 Jun 2016 13:58:41 +0000 (14:58 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1479 added test case to elaborate getEntityByMostOptimalMatchedId method
tcofoegbu [Wed, 29 Jun 2016 13:58:34 +0000 (14:58 +0100)]
JAL-1479 added test case to elaborate getEntityByMostOptimalMatchedId method

7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications
gmungoc [Wed, 29 Jun 2016 13:21:32 +0000 (14:21 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-1270 avoid overwriting .jalview_properties with test service urls
gmungoc [Wed, 29 Jun 2016 12:48:58 +0000 (13:48 +0100)]
JAL-1270 avoid overwriting .jalview_properties with test service urls

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 29 Jun 2016 11:34:51 +0000 (12:34 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1479 improved Sifts PID calculation for determining an Entity to process
tcofoegbu [Wed, 29 Jun 2016 11:34:41 +0000 (12:34 +0100)]
JAL-1479 improved Sifts PID calculation for determining an Entity to process

7 years agoMerge branch 'develop' into features/JAL-2110_crossRefDuplications
gmungoc [Wed, 29 Jun 2016 10:36:16 +0000 (11:36 +0100)]
Merge branch 'develop' into features/JAL-2110_crossRefDuplications

7 years agoJAL-1369 fix bug reloading a project with group sequence reps
gmungoc [Wed, 29 Jun 2016 08:17:29 +0000 (09:17 +0100)]
JAL-1369 fix bug reloading a project with group sequence reps

7 years agoJAL-1479 minor refactor and housekeeping
tcofoegbu [Tue, 28 Jun 2016 15:21:17 +0000 (16:21 +0100)]
JAL-1479 minor refactor and housekeeping

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Tue, 28 Jun 2016 14:28:28 +0000 (15:28 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1479 improved SiftsClient test coverage and implemented previously unimplemented...
tcofoegbu [Tue, 28 Jun 2016 14:28:22 +0000 (15:28 +0100)]
JAL-1479 improved SiftsClient test coverage and implemented previously unimplemented test cases

7 years agotidied loop with generic iteration / loop variable
gmungoc [Mon, 27 Jun 2016 13:04:14 +0000 (14:04 +0100)]
tidied loop with generic iteration / loop variable

7 years agoJAL-2133 refactored duplicated code to AlignmentViewport
gmungoc [Mon, 27 Jun 2016 13:03:09 +0000 (14:03 +0100)]
JAL-2133 refactored duplicated code to AlignmentViewport

7 years agoJAL-1369 additional asserts in testStoreAndRecoverReferenceSeqSettings
gmungoc [Mon, 27 Jun 2016 13:02:15 +0000 (14:02 +0100)]
JAL-1369 additional asserts in testStoreAndRecoverReferenceSeqSettings

7 years agoJAL-1270 unit tests for HiddenSequences
gmungoc [Mon, 27 Jun 2016 12:35:51 +0000 (13:35 +0100)]
JAL-1270 unit tests for HiddenSequences

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Fri, 24 Jun 2016 10:09:15 +0000 (11:09 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1960 updated unit test to include the test case where a sequences has no PDBId...
tcofoegbu [Fri, 24 Jun 2016 10:08:59 +0000 (11:08 +0100)]
JAL-1960 updated unit test to include the test case where a sequences has no PDBId entry(s) but has Uniprot & PDB dbrefs

7 years agoJAL-2130 now simply viewer.dispose() to close down Jmol threads
gmungoc [Thu, 23 Jun 2016 14:26:03 +0000 (15:26 +0100)]
JAL-2130 now simply viewer.dispose() to close down Jmol threads

7 years agoMerge branch 'develop' into merge_JAL-2110
Jim Procter [Thu, 23 Jun 2016 13:58:42 +0000 (14:58 +0100)]
Merge branch 'develop' into merge_JAL-2110

7 years agoJAL-1996 added notes for an alternative way to view example pages source code
tcofoegbu [Thu, 23 Jun 2016 13:47:20 +0000 (14:47 +0100)]
JAL-1996 added notes for an alternative way to view example pages source code

7 years agoJAL-1270 test group fix
Jim Procter [Thu, 23 Jun 2016 13:16:55 +0000 (14:16 +0100)]
JAL-1270 test group fix

7 years agoJAL-2110 make indirect xref searches work by not filtering refs on candidates after...
Jim Procter [Thu, 23 Jun 2016 13:15:05 +0000 (14:15 +0100)]
JAL-2110 make indirect xref searches work by not filtering refs on candidates after selecting them by molecule type (direct==same, indirect==different)

7 years agoJAL-2110 warning message when routine finds non-ds sequences in the dataset (seems...
Jim Procter [Thu, 23 Jun 2016 13:12:09 +0000 (14:12 +0100)]
JAL-2110 warning message when routine finds non-ds sequences in the dataset (seems to happen with alignments returned from Ensembl sequence fetcher)

7 years agoJAL-2110 clarify javadoc
Jim Procter [Thu, 23 Jun 2016 13:11:27 +0000 (14:11 +0100)]
JAL-2110 clarify javadoc

7 years agoJAL-2110 refactor to split SequenceFetcher from x-ref resolution routine
Jim Procter [Thu, 23 Jun 2016 13:11:10 +0000 (14:11 +0100)]
JAL-2110 refactor to split SequenceFetcher from x-ref resolution routine

7 years agoJAL-2110 JAL-1551 formatting
Jim Procter [Thu, 23 Jun 2016 13:09:44 +0000 (14:09 +0100)]
JAL-2110 JAL-1551 formatting

7 years agoJAL-2110 enable and fix failing tests
Jim Procter [Thu, 23 Jun 2016 13:09:36 +0000 (14:09 +0100)]
JAL-2110 enable and fix failing tests

7 years agoJAL-2110 enable and fix test
Jim Procter [Thu, 23 Jun 2016 13:06:10 +0000 (14:06 +0100)]
JAL-2110 enable and fix test

7 years agoJAL-2110 refactor sequenceFetcherTest to allow verifying cross-reference retrieval...
Jim Procter [Thu, 23 Jun 2016 13:04:47 +0000 (14:04 +0100)]
JAL-2110 refactor sequenceFetcherTest to allow verifying cross-reference retrieval for a single sequence sourc

7 years agoJAL-2110 use SequenceI.isProtein()
Jim Procter [Thu, 23 Jun 2016 13:02:38 +0000 (14:02 +0100)]
JAL-2110 use SequenceI.isProtein()

7 years agoJAL-2110 SequenceI.isProtein method
Jim Procter [Thu, 23 Jun 2016 13:01:36 +0000 (14:01 +0100)]
JAL-2110 SequenceI.isProtein method

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 22 Jun 2016 16:03:00 +0000 (17:03 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1996 added link for viewing example source codes, changed release history outline...
tcofoegbu [Wed, 22 Jun 2016 16:02:53 +0000 (17:02 +0100)]
JAL-1996 added link for viewing example source codes, changed release history outline from list to table

7 years agoJAL-2015 fixed bug in copy constructor and added tests
gmungoc [Wed, 22 Jun 2016 15:09:00 +0000 (16:09 +0100)]
JAL-2015 fixed bug in copy constructor and added tests

7 years agoJAL-1982 defensive checks for null annotations array
gmungoc [Wed, 22 Jun 2016 13:56:32 +0000 (14:56 +0100)]
JAL-1982 defensive checks for null annotations array

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Wed, 22 Jun 2016 13:00:08 +0000 (14:00 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

7 years agoJAL-1982 defensive test for null array of annotations
gmungoc [Wed, 22 Jun 2016 12:59:35 +0000 (13:59 +0100)]
JAL-1982 defensive test for null array of annotations

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 22 Jun 2016 11:54:43 +0000 (12:54 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1996 removed quick links in example pages, added one minimal applet embedding...
tcofoegbu [Wed, 22 Jun 2016 11:54:34 +0000 (12:54 +0100)]
JAL-1996 removed quick links in example pages, added one minimal applet embedding example to applet deployment page

7 years agoJAL-2110 remove hardwired detection of search context from the dataset ‘isNucleotide...
Jim Procter [Wed, 22 Jun 2016 10:41:24 +0000 (11:41 +0100)]
JAL-2110 remove hardwired detection of search context from the dataset ‘isNucleotide()’ flag

7 years agoMerge branch 'features/JAL-2110_crossRefDuplications' into merge_JAL-2110
Jim Procter [Tue, 21 Jun 2016 15:13:05 +0000 (16:13 +0100)]
Merge branch 'features/JAL-2110_crossRefDuplications' into merge_JAL-2110

7 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Tue, 21 Jun 2016 14:58:43 +0000 (15:58 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

7 years agoJAL-2074 suppress prompt to save closed Groovy script on Jalview Quit
gmungoc [Tue, 21 Jun 2016 14:27:33 +0000 (15:27 +0100)]
JAL-2074 suppress prompt to save closed Groovy script on Jalview Quit

7 years agoJAL-1270 remove test artefact file after test
gmungoc [Tue, 21 Jun 2016 14:26:16 +0000 (15:26 +0100)]
JAL-1270 remove test artefact file after test

7 years agoMerge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956
Jim Procter [Tue, 21 Jun 2016 13:53:15 +0000 (14:53 +0100)]
Merge branch 'features/JAL-1956_featureStyles' into merge_JAL-1956

7 years agoJAL-1270 ensure before/after clauses have at least alwaysRun=true in them
Jim Procter [Tue, 21 Jun 2016 13:45:56 +0000 (14:45 +0100)]
JAL-1270 ensure before/after clauses have at least alwaysRun=true in them

7 years agoJAL-1270 added runAlways=true to setUp method
gmungoc [Tue, 21 Jun 2016 13:41:43 +0000 (14:41 +0100)]
JAL-1270 added runAlways=true to setUp method

7 years agoJAL-2074 reuse Groovy window when reopening; rebind Cmd-Q to Jalview
gmungoc [Tue, 21 Jun 2016 13:41:08 +0000 (14:41 +0100)]
JAL-2074 reuse Groovy window when reopening; rebind Cmd-Q to Jalview
when closing

7 years agoJAL-2089 cleared out old ‘What’s new’
Jim Procter [Tue, 21 Jun 2016 09:54:17 +0000 (10:54 +0100)]
JAL-2089 cleared out old ‘What’s new’

7 years agoJAL-192 JAL-1369 release notes
Jim Procter [Tue, 21 Jun 2016 09:53:31 +0000 (10:53 +0100)]
JAL-192 JAL-1369 release notes

7 years agoMerge branch 'features/JAL-1369_refseqproject' into develop
Jim Procter [Tue, 21 Jun 2016 09:45:56 +0000 (10:45 +0100)]
Merge branch 'features/JAL-1369_refseqproject' into develop

7 years agoJAL-1369 make sure desktop is cleared before test starts
Jim Procter [Tue, 21 Jun 2016 09:40:47 +0000 (10:40 +0100)]
JAL-1369 make sure desktop is cleared before test starts

7 years agoJAL-1369 jalview2xml tests need to be run sequentially
Jim Procter [Tue, 21 Jun 2016 09:40:19 +0000 (10:40 +0100)]
JAL-1369 jalview2xml tests need to be run sequentially

7 years agoJAL-2110 updated unit test to match code changes
gmungoc [Tue, 21 Jun 2016 09:38:48 +0000 (10:38 +0100)]
JAL-2110 updated unit test to match code changes

7 years agoJAL-1369 mark reference sequence & view state and restore it
Jim Procter [Tue, 21 Jun 2016 09:22:57 +0000 (10:22 +0100)]
JAL-1369 mark reference sequence & view state and restore it

7 years agoJAL-1369 project XML efficiency TODO
Jim Procter [Tue, 21 Jun 2016 09:22:02 +0000 (10:22 +0100)]
JAL-1369 project XML efficiency TODO

7 years agoJAL-1369 dead code TODO?
Jim Procter [Tue, 21 Jun 2016 09:21:40 +0000 (10:21 +0100)]
JAL-1369 dead code TODO?

7 years agoJAL-1369 ensure *real* alignment’s metadata written in Jalview2XML when view contains...
Jim Procter [Tue, 21 Jun 2016 09:21:23 +0000 (10:21 +0100)]
JAL-1369 ensure *real* alignment’s metadata written in Jalview2XML when view contains hidden sequences

7 years agoJAL-1369 fix the test
Jim Procter [Tue, 21 Jun 2016 09:19:17 +0000 (10:19 +0100)]
JAL-1369 fix the test

7 years agoJAL-1369 make sure the fake AlignmentI produced by getFullAlignment retains the curre...
Jim Procter [Tue, 21 Jun 2016 09:18:54 +0000 (10:18 +0100)]
JAL-1369 make sure the fake AlignmentI produced by getFullAlignment retains the current reference sequence

7 years agoJAL-1369 HUGE WARNING: datamodel.HiddenSequences is NOT SAFE
Jim Procter [Tue, 21 Jun 2016 09:18:12 +0000 (10:18 +0100)]
JAL-1369 HUGE WARNING: datamodel.HiddenSequences is NOT SAFE

7 years agoJAL-2113 tidy up canonicalisation of Uniprot xrefs in EMBL data
gmungoc [Tue, 21 Jun 2016 09:08:48 +0000 (10:08 +0100)]
JAL-2113 tidy up canonicalisation of Uniprot xrefs in EMBL data

7 years agoJAL-2113 tidy up canonicalisation of Uniprot xrefs in EMBL data
gmungoc [Tue, 21 Jun 2016 08:57:36 +0000 (09:57 +0100)]
JAL-2113 tidy up canonicalisation of Uniprot xrefs in EMBL data

7 years agoJAL-1369 updated project schema - flag on JSeq to mark view’s reference seq
Jim Procter [Mon, 20 Jun 2016 20:38:41 +0000 (21:38 +0100)]
JAL-1369 updated project schema - flag on JSeq to mark view’s reference seq

7 years agoJAL-1369 failing test
Jim Procter [Mon, 20 Jun 2016 15:26:16 +0000 (16:26 +0100)]
JAL-1369 failing test

7 years agoJAL-1989 JAL-1011 release notes
Jim Procter [Mon, 20 Jun 2016 13:35:47 +0000 (14:35 +0100)]
JAL-1989 JAL-1011 release notes

7 years agoJAL-2086 JAL-2085 release notes
Jim Procter [Mon, 20 Jun 2016 13:22:56 +0000 (14:22 +0100)]
JAL-2086 JAL-2085 release notes

7 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Mon, 20 Jun 2016 12:52:40 +0000 (13:52 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

7 years agoJAL-2065 release notes
Jim Procter [Mon, 20 Jun 2016 12:52:12 +0000 (13:52 +0100)]
JAL-2065 release notes

7 years agoMerge branch 'bugs/JAL-2065' into develop
Jim Procter [Mon, 20 Jun 2016 12:49:18 +0000 (13:49 +0100)]
Merge branch 'bugs/JAL-2065' into develop

7 years agoJAL-2065 port patch to applet
Jim Procter [Mon, 20 Jun 2016 12:48:54 +0000 (13:48 +0100)]
JAL-2065 port patch to applet

7 years agoJAL-1551 tidy
Jim Procter [Mon, 20 Jun 2016 12:48:45 +0000 (13:48 +0100)]
JAL-1551 tidy