jalview.git
7 years agoJAL-2295 sorted properties for readability
gmungoc [Fri, 11 Nov 2016 08:51:36 +0000 (08:51 +0000)]
JAL-2295 sorted properties for readability

7 years agoJAL-2295 (optionally) return Chimera command reply
gmungoc [Fri, 11 Nov 2016 08:50:57 +0000 (08:50 +0000)]
JAL-2295 (optionally) return Chimera command reply

7 years agoJAL-2295 correct test for Float.isNaN(score) !
gmungoc [Fri, 11 Nov 2016 08:50:02 +0000 (08:50 +0000)]
JAL-2295 correct test for Float.isNaN(score) !

7 years agoJAL-2295 additional tests, stronger sanitisation of attribute name
gmungoc [Thu, 10 Nov 2016 13:01:23 +0000 (13:01 +0000)]
JAL-2295 additional tests, stronger sanitisation of attribute name

7 years agoJAL-2295 set attributes commands include feature value, sent via file
gmungoc [Wed, 9 Nov 2016 16:58:33 +0000 (16:58 +0000)]
JAL-2295 set attributes commands include feature value, sent via file

7 years agoJAL-2295 single constant for "RESNUM" feature name
gmungoc [Wed, 9 Nov 2016 16:57:46 +0000 (16:57 +0000)]
JAL-2295 single constant for "RESNUM" feature name

7 years agoJAL-2295 JAL-1596 method to pass a command script file to Chimera
gmungoc [Tue, 8 Nov 2016 16:29:22 +0000 (16:29 +0000)]
JAL-2295 JAL-1596 method to pass a command script file to Chimera

7 years agoJAL-2295 feature and colour commands refactored to use AtomSpecModel
gmungoc [Tue, 8 Nov 2016 14:55:21 +0000 (14:55 +0000)]
JAL-2295 feature and colour commands refactored to use AtomSpecModel

7 years agoJAL-2295 method added to return a compact mapped range in the structure
gmungoc [Tue, 8 Nov 2016 14:54:27 +0000 (14:54 +0000)]
JAL-2295 method added to return a compact mapped range in the structure

7 years agoJAL-2295 extracted AtomSpecModel for reuse in Chimera commands
gmungoc [Tue, 8 Nov 2016 12:42:22 +0000 (12:42 +0000)]
JAL-2295 extracted AtomSpecModel for reuse in Chimera commands

7 years agoJAL-2295 make RangeComparator a top level class for reuse
gmungoc [Tue, 8 Nov 2016 12:32:07 +0000 (12:32 +0000)]
JAL-2295 make RangeComparator a top level class for reuse

7 years agoMerge branch 'develop' into features/JAL-2295setChimeraAttributes
gmungoc [Mon, 7 Nov 2016 15:58:24 +0000 (15:58 +0000)]
Merge branch 'develop' into features/JAL-2295setChimeraAttributes

7 years agoJAL-1270 renamed helper method so it is not run as a test
gmungoc [Mon, 7 Nov 2016 15:42:51 +0000 (15:42 +0000)]
JAL-1270 renamed helper method so it is not run as a test

7 years agoJAL-2272 another test case
gmungoc [Mon, 7 Nov 2016 15:41:21 +0000 (15:41 +0000)]
JAL-2272 another test case

7 years agoJAL-1805 groups=Functional added where missing
gmungoc [Mon, 7 Nov 2016 15:39:46 +0000 (15:39 +0000)]
JAL-1805 groups=Functional added where missing

7 years agoJAL-2272 unit tests added for Platform.isControlDown
gmungoc [Mon, 7 Nov 2016 15:21:01 +0000 (15:21 +0000)]
JAL-2272 unit tests added for Platform.isControlDown

7 years agoJAL-2318 updated help text
gmungoc [Mon, 7 Nov 2016 12:23:40 +0000 (12:23 +0000)]
JAL-2318 updated help text

7 years agoJAL-2282 show url links that need checked; remove 'www' from default
gmungoc [Mon, 7 Nov 2016 11:52:23 +0000 (11:52 +0000)]
JAL-2282 show url links that need checked; remove 'www' from default

7 years agoJAL-2295 handle no progress bar message properly
gmungoc [Mon, 7 Nov 2016 11:01:22 +0000 (11:01 +0000)]
JAL-2295 handle no progress bar message properly

7 years agoJAL-2295 small tidy of javadoc only
gmungoc [Mon, 7 Nov 2016 10:59:12 +0000 (10:59 +0000)]
JAL-2295 small tidy of javadoc only

7 years agoJAL-2295 (unoptimised) write Jalview features as Chimera attributes
gmungoc [Mon, 7 Nov 2016 10:58:24 +0000 (10:58 +0000)]
JAL-2295 (unoptimised) write Jalview features as Chimera attributes

7 years agoMerge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Fri, 4 Nov 2016 16:44:59 +0000 (16:44 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop

7 years agoJAL-2315 Clear sequenceURLLinks if all sequence links are removed.
kiramt [Fri, 4 Nov 2016 16:43:01 +0000 (16:43 +0000)]
JAL-2315 Clear sequenceURLLinks if all sequence links are removed.

7 years agoJAL-2292 squashed bug that breaks feature mapping for different cased residues
tcofoegbu [Fri, 4 Nov 2016 16:08:53 +0000 (16:08 +0000)]
JAL-2292 squashed bug that breaks feature mapping for different cased residues

7 years agoJAL-2292 added javadoc for compareChar(..) utility method
tcofoegbu [Fri, 4 Nov 2016 15:40:49 +0000 (15:40 +0000)]
JAL-2292 added javadoc for compareChar(..) utility method

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Fri, 4 Nov 2016 15:34:11 +0000 (15:34 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-2195 JAL-2262 house keeping
tcofoegbu [Fri, 4 Nov 2016 15:34:01 +0000 (15:34 +0000)]
JAL-2195 JAL-2262 house keeping

7 years agoJAL-2292 fix for wrong mapping output in sequence mapping output window where sequenc...
tcofoegbu [Fri, 4 Nov 2016 15:30:28 +0000 (15:30 +0000)]
JAL-2292 fix for wrong mapping output in sequence mapping output window where sequence residue has different case with structure residue

7 years agoJAL-2292 Wrote utility method for comparing two char either case sensitively or insen...
tcofoegbu [Fri, 4 Nov 2016 15:26:44 +0000 (15:26 +0000)]
JAL-2292 Wrote utility method for comparing two char either case sensitively or insensitively

7 years agoJAL-2292 Unit test for utility method for comparing two chars
tcofoegbu [Fri, 4 Nov 2016 15:25:21 +0000 (15:25 +0000)]
JAL-2292 Unit test for utility method for comparing two chars

7 years agoMerge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Fri, 4 Nov 2016 14:29:55 +0000 (14:29 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop

7 years agoJAL-2282 Better check for existing url links
kiramt [Fri, 4 Nov 2016 14:28:57 +0000 (14:28 +0000)]
JAL-2282 Better check for existing url links

7 years agoJAL-2272 right mouse button on Mac is not Cmd equivalent!
gmungoc [Fri, 4 Nov 2016 14:02:41 +0000 (14:02 +0000)]
JAL-2272 right mouse button on Mac is not Cmd equivalent!

7 years agoJAL-2282 Remove Cache dependency from applet
kiramt [Fri, 4 Nov 2016 13:26:13 +0000 (13:26 +0000)]
JAL-2282 Remove Cache dependency from applet

7 years agoJAL-2282 Message box stays on top at Jalview open; checks for links
kiramt [Fri, 4 Nov 2016 11:10:36 +0000 (11:10 +0000)]
JAL-2282 Message box stays on top at Jalview open; checks for links
before deciding whether to display.

7 years agoJAL-2282 Link menu disabled if there are no valid links
kiramt [Thu, 3 Nov 2016 20:58:08 +0000 (20:58 +0000)]
JAL-2282 Link menu disabled if there are no valid links

7 years agoJAL-2282 Updated warn.url_must_contain
kiramt [Thu, 3 Nov 2016 20:22:40 +0000 (20:22 +0000)]
JAL-2282 Updated warn.url_must_contain

7 years agoJAL-2282 If checkbox on warning dialog is unclicked, reset cache
kiramt [Thu, 3 Nov 2016 19:40:41 +0000 (19:40 +0000)]
JAL-2282 If checkbox on warning dialog is unclicked, reset cache
settings for checking url links.

7 years agoJAL-2281 Back out unit test update, as Mungo already added.
kiramt [Thu, 3 Nov 2016 19:33:16 +0000 (19:33 +0000)]
JAL-2281 Back out unit test update, as Mungo already added.

7 years agoMerge remote-tracking branch 'origin/develop' into bug/JAL-2282
kiramt [Thu, 3 Nov 2016 19:29:51 +0000 (19:29 +0000)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2282

7 years agoJAL-2308 Fixed hiddenColsTest bug/JAL-2308
kiramt [Thu, 3 Nov 2016 19:19:00 +0000 (19:19 +0000)]
JAL-2308 Fixed hiddenColsTest

7 years agoJAL-2312 unit test for bug fix - repeated mapping generated from SIFTS when heuristic...
tcofoegbu [Thu, 3 Nov 2016 17:15:03 +0000 (17:15 +0000)]
JAL-2312 unit test for bug fix - repeated mapping generated from SIFTS when heuristic identification fails for some SIFTS entities

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Thu, 3 Nov 2016 16:50:29 +0000 (16:50 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-2312 Bug fix for repeated mapping generation from SIFTS when heuristic identifica...
tcofoegbu [Thu, 3 Nov 2016 16:47:18 +0000 (16:47 +0000)]
JAL-2312 Bug fix for repeated mapping generation from SIFTS when heuristic identification fails for some SIFTS entities

7 years agoJAL-2281 test added to show searchRefs is now not case sensitive
gmungoc [Thu, 3 Nov 2016 09:24:58 +0000 (09:24 +0000)]
JAL-2281 test added to show searchRefs is now not case sensitive

7 years agoJAL-2281 Minor unit test addition
kiramt [Thu, 3 Nov 2016 09:14:32 +0000 (09:14 +0000)]
JAL-2281 Minor unit test addition

7 years agoJAL-2295 step 1 new menu item to transfer Jalview attributes (no action
gmungoc [Thu, 3 Nov 2016 09:12:25 +0000 (09:12 +0000)]
JAL-2295 step 1 new menu item to transfer Jalview attributes (no action
yet)

7 years agoMerge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Wed, 2 Nov 2016 18:03:42 +0000 (18:03 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop

7 years agoJAL-2281 Unit test updates
kiramt [Wed, 2 Nov 2016 18:02:16 +0000 (18:02 +0000)]
JAL-2281 Unit test updates

7 years agoMerge remote-tracking branch 'origin/bug/JAL-2282' into develop
kiramt [Wed, 2 Nov 2016 16:19:54 +0000 (16:19 +0000)]
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop

7 years agoJAL-2301 table formatted, and corrected to match the diagram and code
gmungoc [Wed, 2 Nov 2016 16:06:47 +0000 (16:06 +0000)]
JAL-2301 table formatted, and corrected to match the diagram and code

7 years agoJAL-2281 Use DBRefs.selectRefs to uppercase URL link target
kiramt [Wed, 2 Nov 2016 15:22:45 +0000 (15:22 +0000)]
JAL-2281 Use DBRefs.selectRefs to uppercase URL link target

7 years agoJAL-2282 Refactor applet too
kiramt [Wed, 2 Nov 2016 15:01:32 +0000 (15:01 +0000)]
JAL-2282 Refactor applet too

7 years agoJAL-2282 Updated and checked messages, English and Spanish
kiramt [Wed, 2 Nov 2016 15:00:37 +0000 (15:00 +0000)]
JAL-2282 Updated and checked messages, English and Spanish

7 years agoJAL-2282 Updated help documentation
kiramt [Wed, 2 Nov 2016 14:18:52 +0000 (14:18 +0000)]
JAL-2282 Updated help documentation

7 years agoJAL-98 JAL-1854 encapsulate 'magic number' threshold 3 in Conservation
gmungoc [Wed, 2 Nov 2016 12:09:49 +0000 (12:09 +0000)]
JAL-98 JAL-1854 encapsulate 'magic number' threshold 3 in Conservation

7 years agoJAL-98 ProfileI interface for Profile
gmungoc [Wed, 2 Nov 2016 11:56:49 +0000 (11:56 +0000)]
JAL-98 ProfileI interface for Profile

7 years agoJAL-98 test updated for percentage rounded
gmungoc [Wed, 2 Nov 2016 11:02:57 +0000 (11:02 +0000)]
JAL-98 test updated for percentage rounded

7 years agoJAL-98 Profile and ResidueCount moved from analysis to datamodel
gmungoc [Wed, 2 Nov 2016 10:05:20 +0000 (10:05 +0000)]
JAL-98 Profile and ResidueCount moved from analysis to datamodel

7 years agoJAL-98 wording "negatively conserved" now "absence conserved"
gmungoc [Wed, 2 Nov 2016 10:04:18 +0000 (10:04 +0000)]
JAL-98 wording "negatively conserved" now "absence conserved"

7 years agoJAL-2282 Code tidy
kiramt [Wed, 2 Nov 2016 10:03:15 +0000 (10:03 +0000)]
JAL-2282 Code tidy

7 years agoJAL-2282 Renamed internal use of sequence id / db accession for
kiramt [Wed, 2 Nov 2016 09:39:10 +0000 (09:39 +0000)]
JAL-2282 Renamed internal use of sequence id / db accession for
consistency

7 years agoJAL-2282 URLLink unit tests updated
kiramt [Wed, 2 Nov 2016 09:28:50 +0000 (09:28 +0000)]
JAL-2282 URLLink unit tests updated

7 years agoConservation now using ResidueCount; tests added
gmungoc [Tue, 1 Nov 2016 16:14:18 +0000 (16:14 +0000)]
Conservation now using ResidueCount; tests added

7 years agoJAL-98 use Integer constants; tests added for propHash values
gmungoc [Tue, 1 Nov 2016 16:13:52 +0000 (16:13 +0000)]
JAL-98 use Integer constants; tests added for propHash values

7 years agoJAL-98 typo in javadoc
gmungoc [Tue, 1 Nov 2016 16:12:58 +0000 (16:12 +0000)]
JAL-98 typo in javadoc

7 years agoJAL-98 simplified repeat() method
gmungoc [Tue, 1 Nov 2016 16:12:27 +0000 (16:12 +0000)]
JAL-98 simplified repeat() method

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

7 years agoJAL-2280 refactored and improved structure file identification code for drog'n'drop...
tcofoegbu [Tue, 1 Nov 2016 15:41:32 +0000 (15:41 +0000)]
JAL-2280 refactored and improved structure file identification code for drog'n'drop on AlignFrame to StructureFile class

7 years agoJAL-2282 Refactor SequenceAnnotationReport to use refactored UrlLink
kiramt [Tue, 1 Nov 2016 14:55:02 +0000 (14:55 +0000)]
JAL-2282 Refactor SequenceAnnotationReport to use refactored UrlLink
code.

7 years agoJAL-2282 Merge
kiramt [Tue, 1 Nov 2016 12:13:27 +0000 (12:13 +0000)]
JAL-2282 Merge

7 years agoJAL-2282 Changed DB accession id token to $DB_ACCESSION$; updated
kiramt [Tue, 1 Nov 2016 12:07:06 +0000 (12:07 +0000)]
JAL-2282 Changed DB accession id token to $DB_ACCESSION$; updated
messages

7 years agoJAL-2282 Refactored URL link creation into UrlLink
kiramt [Tue, 1 Nov 2016 12:00:55 +0000 (12:00 +0000)]
JAL-2282 Refactored URL link creation into UrlLink

7 years agoJAL-2282 Removed unexpected ; from code
kiramt [Mon, 31 Oct 2016 09:58:23 +0000 (09:58 +0000)]
JAL-2282 Removed unexpected ; from code

7 years agoJAL-2282 Force double-clicking to use sequence_id cases and not accession_id
kiramt [Mon, 31 Oct 2016 09:56:36 +0000 (09:56 +0000)]
JAL-2282 Force double-clicking to use sequence_id cases and not accession_id
cases

7 years agoJAL-98 round when formatting dec places
gmungoc [Mon, 31 Oct 2016 13:47:32 +0000 (13:47 +0000)]
JAL-98 round when formatting dec places

7 years agoForce double-clicking to use sequence_id cases and not accession_id
kiramt [Mon, 31 Oct 2016 09:56:36 +0000 (09:56 +0000)]
Force double-clicking to use sequence_id cases and not accession_id
cases

7 years agoUpdated messages.
kiramt [Mon, 31 Oct 2016 09:43:56 +0000 (09:43 +0000)]
Updated messages.

7 years agoUse ACCESSION_ID for database accession id, and SEQUENCE_ID for sequence
kiramt [Mon, 31 Oct 2016 08:14:49 +0000 (08:14 +0000)]
Use ACCESSION_ID for database accession id, and SEQUENCE_ID for sequence
name.

7 years agoJAL-2282 test assertions for 'other' dbsource spikes/geoff spikes/jpred
gmungoc [Thu, 27 Oct 2016 15:21:31 +0000 (16:21 +0100)]
JAL-2282 test assertions for 'other' dbsource

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

7 years agoJAL-2280 Improvement to enable drag'n'drop association of mmCIF file structures to...
tcofoegbu [Thu, 27 Oct 2016 14:24:18 +0000 (15:24 +0100)]
JAL-2280 Improvement to enable drag'n'drop association of mmCIF file structures to sequences

7 years agoJAL-98 refactor bleachColour() to ColorUtils
gmungoc [Thu, 27 Oct 2016 09:45:06 +0000 (10:45 +0100)]
JAL-98 refactor bleachColour() to ColorUtils

7 years agoJAL-2287 treat Escape like Cancel in dialog box
gmungoc [Thu, 27 Oct 2016 08:03:05 +0000 (09:03 +0100)]
JAL-2287 treat Escape like Cancel in dialog box

7 years agoJAL-2287 Cancel option on Close Chimera? dialog
gmungoc [Wed, 26 Oct 2016 15:42:51 +0000 (16:42 +0100)]
JAL-2287 Cancel option on Close Chimera? dialog

7 years agoMerge branch 'bug/JAL-98consensusMemory' into develop
gmungoc [Wed, 26 Oct 2016 15:22:45 +0000 (16:22 +0100)]
Merge branch 'bug/JAL-98consensusMemory' into develop

7 years agoJAL-2286 modal residue check + commenting
gmungoc [Wed, 26 Oct 2016 15:11:17 +0000 (16:11 +0100)]
JAL-2286 modal residue check + commenting

7 years agoJAL-98 null reference to globalColourScheme as it has ref to consensus
gmungoc [Wed, 26 Oct 2016 15:09:56 +0000 (16:09 +0100)]
JAL-98 null reference to globalColourScheme as it has ref to consensus

7 years agoJAL-2286 javadoc, refactor, unit tests for threshold and conservation
gmungoc [Wed, 26 Oct 2016 15:09:21 +0000 (16:09 +0100)]
JAL-2286 javadoc, refactor, unit tests for threshold and conservation
colouring

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Wed, 26 Oct 2016 10:37:03 +0000 (11:37 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoMerge branch 'features/JAL-2284_export-biojsmsa-via-cli' into develop
tcofoegbu [Wed, 26 Oct 2016 10:36:20 +0000 (11:36 +0100)]
Merge branch 'features/JAL-2284_export-biojsmsa-via-cli' into develop

7 years agoJAL-2284 basic support for exporting BioJS MSA viewer via CLI features/JAL-2284_export-biojsmsa-via-cli
tcofoegbu [Wed, 26 Oct 2016 10:31:53 +0000 (11:31 +0100)]
JAL-2284 basic support for exporting BioJS MSA viewer via CLI

7 years agoJAL-2286 use constant for fixed colours
gmungoc [Tue, 25 Oct 2016 15:35:51 +0000 (16:35 +0100)]
JAL-2286 use constant for fixed colours

7 years agoJAL-98 javadoc corrected
gmungoc [Tue, 25 Oct 2016 15:22:21 +0000 (16:22 +0100)]
JAL-98 javadoc corrected

7 years agoJAL-98 javadoc added
gmungoc [Tue, 25 Oct 2016 15:21:48 +0000 (16:21 +0100)]
JAL-98 javadoc added

7 years agoJAL-98 minor fixes to / tests for annotation derivation
gmungoc [Tue, 25 Oct 2016 15:21:17 +0000 (16:21 +0100)]
JAL-98 minor fixes to / tests for annotation derivation

7 years agoMerge branch 'releases/Release_2_10_0_Branch_fixmaster' into develop
Jim Procter [Tue, 25 Oct 2016 10:55:28 +0000 (11:55 +0100)]
Merge branch 'releases/Release_2_10_0_Branch_fixmaster' into develop

7 years agoJAL-2089 patch broken merge to master for Release 2.10.0b1 releases/Release_2_10_0_Branch
Jim Procter [Tue, 25 Oct 2016 10:49:32 +0000 (11:49 +0100)]
JAL-2089 patch broken merge to master for Release 2.10.0b1

7 years agoMerge branch 'releases/Release_2_10_0_Branch'
Jim Procter [Tue, 25 Oct 2016 10:46:04 +0000 (11:46 +0100)]
Merge branch 'releases/Release_2_10_0_Branch'

7 years agoMerge branch 'bug/JAL-2277_html-output-wrapped-mode' into develop
tcofoegbu [Tue, 25 Oct 2016 10:26:33 +0000 (11:26 +0100)]
Merge branch 'bug/JAL-2277_html-output-wrapped-mode' into develop