jalview.git
7 years agoJAL-2277 Refactored out duplicated method - printUnwrapped() in HtmlSvgOutput, extern...
tcofoegbu [Fri, 11 Nov 2016 17:23:24 +0000 (17:23 +0000)]
JAL-2277 Refactored out duplicated method - printUnwrapped() in HtmlSvgOutput, externalised facebox script, and made other minor housekeepings

7 years agoJAL-2177 remove Jmol project signature from jar so it can be resigned
Jim Procter [Fri, 11 Nov 2016 15:28:21 +0000 (15:28 +0000)]
JAL-2177 remove Jmol project signature from jar so it can be resigned

7 years agoMerge branch 'bug/JAL-2317_jmol_chimera-chain-factorisation' into develop
tcofoegbu [Thu, 10 Nov 2016 16:11:36 +0000 (16:11 +0000)]
Merge branch 'bug/JAL-2317_jmol_chimera-chain-factorisation' into develop

7 years agoMerge branch 'develop' into bug/JAL-2317_jmol_chimera-chain-factorisation
tcofoegbu [Thu, 10 Nov 2016 15:57:41 +0000 (15:57 +0000)]
Merge branch 'develop' into bug/JAL-2317_jmol_chimera-chain-factorisation

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Thu, 10 Nov 2016 15:55:51 +0000 (15:55 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-2317 Fixed Chimera command for hiding/showing distinct chains bug/JAL-2317_jmol_chimera-chain-factorisation
tcofoegbu [Thu, 10 Nov 2016 15:45:33 +0000 (15:45 +0000)]
JAL-2317 Fixed Chimera command for hiding/showing distinct chains

7 years agoBugfix to enable accurate chain extraction/association with models loaded in Chimera...
tcofoegbu [Thu, 10 Nov 2016 11:56:51 +0000 (11:56 +0000)]
Bugfix to enable accurate chain extraction/association with models loaded in Chimera, refactored and factorised some duplicated codes with Jmol viewer implementation.

7 years agoJAL-2320 thread to close Chimera viewer panel if Chimera shut down features/JAL-2320_closeChimeraAction
gmungoc [Thu, 10 Nov 2016 11:03:52 +0000 (11:03 +0000)]
JAL-2320 thread to close Chimera viewer panel if Chimera shut down

7 years agoJAL-2320 added getViewer() method to return Chimera or Jmol panel
gmungoc [Thu, 10 Nov 2016 11:03:14 +0000 (11:03 +0000)]
JAL-2320 added getViewer() method to return Chimera or Jmol panel

7 years agoJAL-2301 corrected search example to match AA properties mentioned
gmungoc [Tue, 8 Nov 2016 15:53:55 +0000 (15:53 +0000)]
JAL-2301 corrected search example to match AA properties mentioned

7 years agoJAL-2301 made T hydrophobic as per the cited conservation method
gmungoc [Tue, 8 Nov 2016 15:47:30 +0000 (15:47 +0000)]
JAL-2301 made T hydrophobic as per the cited conservation method

7 years agoJAL-1961 added link to GFF3 format as well as GFF2
gmungoc [Tue, 8 Nov 2016 15:16:26 +0000 (15:16 +0000)]
JAL-1961 added link to GFF3 format as well as GFF2

7 years agoJAL-2309 Made test timeout slightly longer bug/JAL-2309
kiramt [Tue, 8 Nov 2016 14:18:48 +0000 (14:18 +0000)]
JAL-2309 Made test timeout slightly longer

7 years agoJAL-2309 Adjusted timeout on headless tests
kiramt [Tue, 8 Nov 2016 13:57:18 +0000 (13:57 +0000)]
JAL-2309 Adjusted timeout on headless tests

7 years agoJAL-2280 Updated spanish translation as recommended by Juan
tcofoegbu [Tue, 8 Nov 2016 11:12:42 +0000 (11:12 +0000)]
JAL-2280 Updated spanish translation as recommended by Juan

7 years agoJAL-2292 updated method calls
tcofoegbu [Tue, 8 Nov 2016 10:26:21 +0000 (10:26 +0000)]
JAL-2292 updated method calls

7 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
tcofoegbu [Tue, 8 Nov 2016 10:22:05 +0000 (10:22 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

7 years agoJAL-2292 renamed method and improved implementation as suggested by Kira
tcofoegbu [Tue, 8 Nov 2016 10:21:55 +0000 (10:21 +0000)]
JAL-2292 renamed method and improved implementation as suggested by Kira

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 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-966 JAL-1854 removed redundant methods / modifiers from search
gmungoc [Fri, 4 Nov 2016 10:02:19 +0000 (10:02 +0000)]
JAL-966 JAL-1854 removed redundant methods / modifiers from search
result interface, corrected faulty toString

7 years agoJAL-2302 unit tests added for Finder
gmungoc [Fri, 4 Nov 2016 09:26:04 +0000 (09:26 +0000)]
JAL-2302 unit tests added for Finder

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-2310 don't double-count sequence matches; code tidying
gmungoc [Thu, 3 Nov 2016 13:30:23 +0000 (13:30 +0000)]
JAL-2310 don't double-count sequence matches; code tidying

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 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 agoJAL-345 JAL-1738 menu item, AlignFrame action listener and documentation for Select...
Jim Procter [Wed, 2 Nov 2016 16:29:44 +0000 (16:29 +0000)]
JAL-345 JAL-1738 menu item, AlignFrame action listener and documentation for Select->Select Highlighted Regions.

Accelerator key (CMD-L) doesn’t seem to work right now.

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-1738 JAL-345 fix test - method appears to work
Jim Procter [Wed, 2 Nov 2016 16:18:10 +0000 (16:18 +0000)]
JAL-1738 JAL-345 fix test - method appears to work

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-1738 JAL-345 fix for JAL-2302 only report Matches that are not contained by the...
Jim Procter [Wed, 2 Nov 2016 15:33:09 +0000 (15:33 +0000)]
JAL-1738 JAL-345 fix for JAL-2302 only report Matches that are not contained by the previous match.

7 years agoJAL-1738 JAL-345 switch expected/observed in test
Jim Procter [Wed, 2 Nov 2016 15:32:28 +0000 (15:32 +0000)]
JAL-1738 JAL-345 switch expected/observed in test

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-345 JAL-1738 fix test (still passes)
Jim Procter [Wed, 2 Nov 2016 15:07:05 +0000 (15:07 +0000)]
JAL-345 JAL-1738 fix test (still passes)

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-345 javadoc and note about JAL-2300
Jim Procter [Wed, 2 Nov 2016 14:53:03 +0000 (14:53 +0000)]
JAL-345 javadoc and note about JAL-2300

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-354 JAL-1738 add returns SearchResultMatchI instance so it can be cached
Jim Procter [Wed, 2 Nov 2016 14:07:42 +0000 (14:07 +0000)]
JAL-354 JAL-1738 add returns SearchResultMatchI instance so it can be cached

7 years agoJAL-966 JAL-345 JAL-1738 decontaminate SearchResultI with references to Match
Jim Procter [Tue, 1 Nov 2016 21:32:48 +0000 (21:32 +0000)]
JAL-966 JAL-345 JAL-1738 decontaminate SearchResultI with references to Match

7 years agoJAL-966 JAL-345 JAL-1738 quick rewrite of scrollToPosition in applet - further refact...
Jim Procter [Tue, 1 Nov 2016 21:37:48 +0000 (21:37 +0000)]
JAL-966 JAL-345 JAL-1738 quick rewrite of scrollToPosition in applet - further refactoring needed to merge applet/desktop scroll logic

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 agoJAL-1738 JAL-345 failing test for mark columns
Jim Procter [Tue, 1 Nov 2016 17:52:58 +0000 (17:52 +0000)]
JAL-1738 JAL-345 failing test for mark columns
 - fail actually due to jalview.analysis.Finder creating more than expected SearchResultMatch objects for a given pattern

7 years agoJAL-345 JAL-1738 strengthen test for cardinalty count/range selects
Jim Procter [Tue, 1 Nov 2016 17:21:49 +0000 (17:21 +0000)]
JAL-345 JAL-1738 strengthen test for cardinalty count/range selects

7 years agoJAL-345 JAL-1738 typo
Jim Procter [Tue, 1 Nov 2016 17:18:18 +0000 (17:18 +0000)]
JAL-345 JAL-1738 typo

7 years agoJAL-1738 JAL-345 fix broken calculation of newly marked bits
Jim Procter [Tue, 1 Nov 2016 17:17:53 +0000 (17:17 +0000)]
JAL-1738 JAL-345 fix broken calculation of newly marked bits

7 years agoJAL-345 JAL-1738 new tests (failing) for SearchResultsI.markColumns
Jim Procter [Tue, 1 Nov 2016 16:59:41 +0000 (16:59 +0000)]
JAL-345 JAL-1738 new tests (failing) for SearchResultsI.markColumns

7 years agoJAL-1738 JAL-345 trivial tests for relocated SearchResultsI ref on AlignViewportI
Jim Procter [Tue, 1 Nov 2016 16:32:09 +0000 (16:32 +0000)]
JAL-1738 JAL-345 trivial tests for relocated SearchResultsI ref on AlignViewportI

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 agoJAL-1723 ellipsis in tooltip if xrefs to more than 40 db sources
gmungoc [Mon, 31 Oct 2016 11:45:44 +0000 (11:45 +0000)]
JAL-1723 ellipsis in tooltip if xrefs to more than 40 db sources

7 years agoMerge branch 'develop' into features/JAL-1723_sequenceReport
gmungoc [Mon, 31 Oct 2016 10:25:06 +0000 (10:25 +0000)]
Merge branch 'develop' into features/JAL-1723_sequenceReport

Conflicts:
src/jalview/io/SequenceAnnotationReport.java

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.