jalview.git
7 years agoUnit tests for UrlLink bug/JAL-2281JAL-2282
kiramt [Mon, 24 Oct 2016 15:46:59 +0000 (16:46 +0100)]
Unit tests for UrlLink

7 years agoFixed dialog box messages in English and Spanish. Adjustments to dialog
kiramt [Mon, 24 Oct 2016 12:37:22 +0000 (13:37 +0100)]
Fixed dialog box messages in English and Spanish. Adjustments to dialog
box spacing.

7 years agoCorrect Preferences to check for SEQUENCE_NAME as well as SEQUENCE_ID on
kiramt [Mon, 24 Oct 2016 09:38:56 +0000 (10:38 +0100)]
Correct Preferences to check for SEQUENCE_NAME as well as SEQUENCE_ID on
initialisation.

7 years agoCode tidy up. Unit test passes.
kiramt [Mon, 24 Oct 2016 09:16:25 +0000 (10:16 +0100)]
Code tidy up. Unit test passes.

7 years agoWorking links menu
kiramt [Sat, 22 Oct 2016 16:55:23 +0000 (17:55 +0100)]
Working links menu

7 years agoFactored URL Link constants out into UrlConstants file.
kiramt [Fri, 21 Oct 2016 13:37:04 +0000 (14:37 +0100)]
Factored URL Link constants out into UrlConstants file.

7 years agoCreated (failing) unit test for addFeatureLinks
kiramt [Fri, 21 Oct 2016 07:08:23 +0000 (08:08 +0100)]
Created (failing) unit test for addFeatureLinks

7 years agoJAL-2269 JAL-2195 review and revised test
Jim Procter [Wed, 19 Oct 2016 16:11:16 +0000 (17:11 +0100)]
JAL-2269 JAL-2195 review and revised test
* cut down DNMT1_MOUSE.pdb file to a stub and renamed to examples/testdata/localstruct.pdb
* added comments explaining test behaviour
* remove try/catch - exceptions should cause test to fail.

7 years agoJAL-2089 update 2.10.0b1 release date
Jim Procter [Wed, 19 Oct 2016 15:26:51 +0000 (16:26 +0100)]
JAL-2089 update 2.10.0b1 release date

7 years agoJAL-2089 release notes and new known defects
Jim Procter [Tue, 18 Oct 2016 16:42:37 +0000 (17:42 +0100)]
JAL-2089 release notes and new known defects

7 years agoJAL-2039 release notes
Jim Procter [Tue, 18 Oct 2016 14:22:19 +0000 (15:22 +0100)]
JAL-2039 release notes

7 years agoJAL-2245 release notes
Jim Procter [Tue, 18 Oct 2016 14:21:37 +0000 (15:21 +0100)]
JAL-2245 release notes

7 years agoJAL-2089 2.10.0b1 release notes
Jim Procter [Tue, 18 Oct 2016 14:20:48 +0000 (15:20 +0100)]
JAL-2089 2.10.0b1 release notes

7 years agoJAL-2039 rejig instructions for Structure Chooser and clarify what happens after...
Jim Procter [Tue, 18 Oct 2016 14:20:06 +0000 (15:20 +0100)]
JAL-2039 rejig instructions for Structure Chooser and clarify what happens after ‘View’ is pressed

7 years agoMerge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop
kiramt [Mon, 17 Oct 2016 13:38:15 +0000 (14:38 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop

7 years agoacceptDrop call added before getTransferable in alignment frame drag and bug/JAL-1552dragndroptake2
kiramt [Mon, 17 Oct 2016 13:36:16 +0000 (14:36 +0100)]
acceptDrop call added before getTransferable in alignment frame drag and
drop.

7 years agoJAL-2262 JAL-2195 Improvement to set PDBId availability in a flag
tcofoegbu [Mon, 17 Oct 2016 11:32:38 +0000 (12:32 +0100)]
JAL-2262 JAL-2195 Improvement to set PDBId availability in a flag

7 years agoRe-attempt to fix JAL-1552 by removing extra calls to acceptDrop.
kiramt [Mon, 17 Oct 2016 08:24:58 +0000 (09:24 +0100)]
Re-attempt to fix JAL-1552 by removing extra calls to acceptDrop.

7 years agoMerge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties task/JAL-2196pdbeProperties
gmungoc [Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)]
Merge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties

7 years agoJAL-2253 2 second timeout on ping URL, default 5 minutes on others feature/JAL-2553ensemblGenomes
gmungoc [Thu, 13 Oct 2016 15:43:52 +0000 (16:43 +0100)]
JAL-2253 2 second timeout on ping URL, default 5 minutes on others

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Thu, 13 Oct 2016 10:13:37 +0000 (11:13 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-1479 revise warning message to suit all contexts bug/JAL-2044jmolModelBinding
gmungoc [Thu, 13 Oct 2016 09:58:06 +0000 (10:58 +0100)]
JAL-1479 revise warning message to suit all contexts

7 years agoJAL-2044 increase Jmol file load timeout from 5 to 20 seconds
gmungoc [Thu, 13 Oct 2016 09:56:37 +0000 (10:56 +0100)]
JAL-2044 increase Jmol file load timeout from 5 to 20 seconds

7 years agoJAL-2044 ensure AAStructureBindingModel.pdbEntry has no file duplicated;
gmungoc [Thu, 13 Oct 2016 09:55:42 +0000 (10:55 +0100)]
JAL-2044 ensure AAStructureBindingModel.pdbEntry has no file duplicated;
pull up modelFileNames

7 years agoJAL-2044 include model name in progress bar message opening file
gmungoc [Thu, 13 Oct 2016 09:50:27 +0000 (10:50 +0100)]
JAL-2044 include model name in progress bar message opening file

7 years agoMerge branch 'features/JAL-2039_Offer_cached_structurefiles_immediately' into develop
tcofoegbu [Tue, 11 Oct 2016 12:03:24 +0000 (13:03 +0100)]
Merge branch 'features/JAL-2039_Offer_cached_structurefiles_immediately' into develop

7 years agoJAL-2039 improvement to offer cached structure view immediately when cached structure... features/JAL-2039_Offer_cached_structurefiles_immediately
tcofoegbu [Tue, 11 Oct 2016 12:01:39 +0000 (13:01 +0100)]
JAL-2039 improvement to offer cached structure view immediately when cached structures exists

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Tue, 11 Oct 2016 11:10:18 +0000 (12:10 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-2241 check for null jprovider when processing New View action
gmungoc [Tue, 11 Oct 2016 11:09:37 +0000 (12:09 +0100)]
JAL-2241 check for null jprovider when processing New View action

7 years agoJAL-1552 added acceptDrop call before getTransferable to avoid error bug/JAL-1552dragndropurl
kiramt [Tue, 11 Oct 2016 11:01:23 +0000 (12:01 +0100)]
JAL-1552 added acceptDrop call before getTransferable to avoid error
with Java native dnd

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
gmungoc [Tue, 11 Oct 2016 08:37:28 +0000 (09:37 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-1479 small tidy of error message when Sifts mapping fails
gmungoc [Tue, 11 Oct 2016 08:33:13 +0000 (09:33 +0100)]
JAL-1479 small tidy of error message when Sifts mapping fails

7 years agoJAL-2233 reverted changes to Jmol logging levels
gmungoc [Tue, 11 Oct 2016 08:27:33 +0000 (09:27 +0100)]
JAL-2233 reverted changes to Jmol logging levels

7 years agoMerge branch 'bug/JAL-2262_dnd-for-local-structure-files' into develop
tcofoegbu [Mon, 10 Oct 2016 15:15:49 +0000 (16:15 +0100)]
Merge branch 'bug/JAL-2262_dnd-for-local-structure-files' into develop

7 years agoJAL-2262 JAL-2195 unit test for bug bug/JAL-2262_dnd-for-local-structure-files
tcofoegbu [Mon, 10 Oct 2016 14:59:45 +0000 (15:59 +0100)]
JAL-2262 JAL-2195 unit test for bug

7 years agoJAL-2262 JAL-2195 bug fix for mapping local structure files
tcofoegbu [Mon, 10 Oct 2016 14:58:55 +0000 (15:58 +0100)]
JAL-2262 JAL-2195 bug fix for mapping local structure files

7 years agoJAL-2254 map error text in root node of EMBL XML response
gmungoc [Thu, 6 Oct 2016 15:16:08 +0000 (16:16 +0100)]
JAL-2254 map error text in root node of EMBL XML response

7 years agoMerge branch 'develop' into task/JAL-2196pdbeProperties
gmungoc [Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)]
Merge branch 'develop' into task/JAL-2196pdbeProperties

7 years agoJAL-2252 now buffered read of 3 lines of a time in help files
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

7 years agoJAL-2245 checks for null added (in case EMBL fetch finds nothing)
gmungoc [Thu, 6 Oct 2016 07:52:55 +0000 (08:52 +0100)]
JAL-2245 checks for null added (in case EMBL fetch finds nothing)

7 years agoJAL-2189 update year in author.props Release_2_10_0
Jim Procter [Wed, 5 Oct 2016 22:18:27 +0000 (23:18 +0100)]
JAL-2189 update year in author.props

7 years agoMerge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 22:07:28 +0000 (23:07 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch

7 years agoJAL-2189 CITATION file and reorder authors: 2.10: JBP, MC, TCO...
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...

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:15:44 +0000 (22:15 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-2252 workaround for link checker not recognising multiline anchors
Jim Procter [Wed, 5 Oct 2016 21:15:04 +0000 (22:15 +0100)]
JAL-2252 workaround for link checker not recognising multiline anchors

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Wed, 5 Oct 2016 21:07:18 +0000 (22:07 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-2189 updated third party licenses
Jim Procter [Wed, 5 Oct 2016 21:03:24 +0000 (22:03 +0100)]
JAL-2189 updated third party licenses

7 years agoJAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:50:09 +0000 (21:50 +0100)]
JAL-2189 release notes

7 years agoJAL-2036 rebuild menus for each panel before adding to splitframe
Jim Procter [Wed, 5 Oct 2016 20:49:04 +0000 (21:49 +0100)]
JAL-2036 rebuild menus for each panel before adding to splitframe

7 years agoJAL-2189 release notes
Jim Procter [Wed, 5 Oct 2016 20:28:36 +0000 (21:28 +0100)]
JAL-2189 release notes

7 years agoJAL-2189 tidy up release notes
Jim Procter [Wed, 5 Oct 2016 20:08:48 +0000 (21:08 +0100)]
JAL-2189 tidy up release notes

7 years agoJAL-2189 tweak ensembl release notes
Jim Procter [Wed, 5 Oct 2016 19:58:12 +0000 (20:58 +0100)]
JAL-2189 tweak ensembl release notes

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
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

7 years agoMerge branch 'develop' into releases/Release_2_10_Branch
Jim Procter [Wed, 5 Oct 2016 16:56:17 +0000 (17:56 +0100)]
Merge branch 'develop' into releases/Release_2_10_Branch

7 years agoJAL-2189 formatting and release notes
Jim Procter [Wed, 5 Oct 2016 16:53:20 +0000 (17:53 +0100)]
JAL-2189 formatting and release notes

7 years agoJAL-2189 license header
Jim Procter [Wed, 5 Oct 2016 16:52:54 +0000 (17:52 +0100)]
JAL-2189 license header

7 years agoJAL-2189 apply license
Jim Procter [Wed, 5 Oct 2016 16:32:54 +0000 (17:32 +0100)]
JAL-2189 apply license

7 years agoJAL-2189 format help
Jim Procter [Wed, 5 Oct 2016 15:52:19 +0000 (16:52 +0100)]
JAL-2189 format help

7 years agoJAL-2189 format tests
Jim Procter [Wed, 5 Oct 2016 15:33:28 +0000 (16:33 +0100)]
JAL-2189 format tests

7 years agoJAL-2189 formatting and GPL
Jim Procter [Wed, 5 Oct 2016 15:31:57 +0000 (16:31 +0100)]
JAL-2189 formatting and GPL

7 years agoJAL-2189 source formatting
Jim Procter [Wed, 5 Oct 2016 15:28:14 +0000 (16:28 +0100)]
JAL-2189 source formatting

7 years agoMerge branch 'develop' into task/JAL-2196pdbeProperties
gmungoc [Wed, 5 Oct 2016 15:17:59 +0000 (16:17 +0100)]
Merge branch 'develop' into task/JAL-2196pdbeProperties

Conflicts:
src/jalview/datamodel/PDBEntry.java
test/jalview/ws/dbsources/UniprotTest.java

7 years agoQQMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 5 Oct 2016 15:13:33 +0000 (16:13 +0100)]
QQMerge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-1563 JAL-1479 minor house-keeping for Uniprot FTS & SIFTS user docs
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

7 years agoRevert "JAL-2245 Castor mapping and code changes for change to ENA XML format"
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.

7 years agoMerge branch 'develop' of http://source.jalview.org/git/jalview into develop
Jim Procter [Wed, 5 Oct 2016 14:59:59 +0000 (15:59 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop

7 years agoJAL-2189 release notes/whats new
Jim Procter [Wed, 5 Oct 2016 14:53:01 +0000 (15:53 +0100)]
JAL-2189 release notes/whats new

7 years agoJAL-2189 JAL-2152 Chimera 1.11.1 minimum version requirement
Jim Procter [Wed, 5 Oct 2016 14:52:49 +0000 (15:52 +0100)]
JAL-2189 JAL-2152 Chimera 1.11.1 minimum version requirement

7 years agoJAL-1191 revert to using SequenceOntologyLite due to downstream
gmungoc [Wed, 5 Oct 2016 14:12:01 +0000 (15:12 +0100)]
JAL-1191 revert to using SequenceOntologyLite due to downstream
dependencies

7 years agoJAL-1191 configure full SO for desktop, SOLite for applet (without
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)

7 years agoJAL-2245 defence against NullPointer if no EMBL data unmarshalled
gmungoc [Wed, 5 Oct 2016 11:52:45 +0000 (12:52 +0100)]
JAL-2245 defence against NullPointer if no EMBL data unmarshalled

7 years agoJAL-1191 use full SO in desktop application
gmungoc [Wed, 5 Oct 2016 11:51:11 +0000 (12:51 +0100)]
JAL-1191 use full SO in desktop application

7 years agoJAL-2105 update Ensembl REST version to 4.7
gmungoc [Wed, 5 Oct 2016 11:49:44 +0000 (12:49 +0100)]
JAL-2105 update Ensembl REST version to 4.7

7 years agoJAL-1191 refined warning message
gmungoc [Wed, 5 Oct 2016 11:01:31 +0000 (12:01 +0100)]
JAL-1191 refined warning message

7 years agoJAL-1191 added mRNA isA transcript to SequenceOntologyLite (because
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!)

7 years agoMerge branch 'bug/JAL-2245enaXmlChange' into develop
gmungoc [Tue, 4 Oct 2016 15:03:18 +0000 (16:03 +0100)]
Merge branch 'bug/JAL-2245enaXmlChange' into develop

7 years agoMerge branch 'bug/JAL-2210_hack_for_Release_2_10' 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

7 years agoJAL-2245 Castor mapping and code changes for change to ENA XML format bug/JAL-2245enaXmlChange
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

7 years agoJAL-2232 some fix / partial fix of failing tests bug/JAL-2210_hack_for_Release_2_10
gmungoc [Tue, 4 Oct 2016 13:55:59 +0000 (14:55 +0100)]
JAL-2232 some fix / partial fix of failing tests

7 years agoMerge branch 'releases/Release_2_10_Branch' into develop
Jim Procter [Tue, 4 Oct 2016 13:28:02 +0000 (14:28 +0100)]
Merge branch 'releases/Release_2_10_Branch' into develop

7 years agoJAL-2189 release notes
Jim Procter [Tue, 4 Oct 2016 13:27:22 +0000 (14:27 +0100)]
JAL-2189 release notes

7 years agoJAL-2232 added test that failed before last fix, passes after it
gmungoc [Tue, 4 Oct 2016 12:50:02 +0000 (13:50 +0100)]
JAL-2232 added test that failed before last fix, passes after it

7 years agoJAL-2232 JAL-2154 update dbrefs to newly created dataset sequence
gmungoc [Tue, 4 Oct 2016 10:58:56 +0000 (11:58 +0100)]
JAL-2232 JAL-2154 update dbrefs to newly created dataset sequence

7 years agoJAL-2189 link to feature sorting documentation
Jim Procter [Tue, 4 Oct 2016 09:56:46 +0000 (10:56 +0100)]
JAL-2189 link to feature sorting documentation

7 years agoJAL-2189 JAL-2005 mention alignment order preservation when equivalent sequences...
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.

7 years agoJAL-2189 release notes
Jim Procter [Tue, 4 Oct 2016 09:46:33 +0000 (10:46 +0100)]
JAL-2189 release notes

7 years agoJAL-2005 JAL-599 test alignment and features for checking feature sort behaviour
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

7 years agoJAL-2110 javadoc formatting only
gmungoc [Mon, 3 Oct 2016 16:13:57 +0000 (17:13 +0100)]
JAL-2110 javadoc formatting only

7 years agoJAL-2110 JAL-1705 handle not found (400) better
gmungoc [Mon, 3 Oct 2016 16:11:50 +0000 (17:11 +0100)]
JAL-2110 JAL-1705 handle not found (400) better

7 years agoJAL-2110 additional tests for setDatasetSequence, javadoc for isProtein
gmungoc [Mon, 3 Oct 2016 15:10:21 +0000 (16:10 +0100)]
JAL-2110 additional tests for setDatasetSequence, javadoc for isProtein

7 years agoJAL-2189 update RELEASE file
Jim Procter [Mon, 3 Oct 2016 14:08:01 +0000 (15:08 +0100)]
JAL-2189 update RELEASE file

7 years agoJAL-2189 more release notes
Jim Procter [Mon, 3 Oct 2016 14:06:34 +0000 (15:06 +0100)]
JAL-2189 more release notes

7 years agoJAL-2189 ensembl sequence fetching, locus view and variant annotation transfer docs
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

7 years agoJAL-2189 release notes
Jim Procter [Mon, 3 Oct 2016 13:11:32 +0000 (14:11 +0100)]
JAL-2189 release notes

7 years agoJAL-2210 use addDBRef to ensure normalisation (just in case the uniprot record is...
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!)

7 years agoJAL-2210 need to add both transcript and product, and Ensembl needs to be marked...
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

7 years agoJAL-2210 JAL-2232 remove version number from ENACDS excession
Jim Procter [Mon, 3 Oct 2016 08:18:03 +0000 (09:18 +0100)]
JAL-2210 JAL-2232 remove version number from ENACDS excession

7 years agoJAL-2210 hack to remove EMBL from Protein crossrefs, and ENSEMBL from CDS crossers.
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.

7 years agoJAL-2210 explicit ‘doNotAdd’ list to prevent sequences retrieved from being added...
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

7 years agoJAL-2210 first pass at attempting to fix CrossRef tests due to removal of sequence...
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.