gmungoc [Fri, 31 Aug 2018 08:49:55 +0000 (09:49 +0100)]
Merge branch 'bug/JAL-3003epsWithSelection' into trialMerge
Conflicts:
src/jalview/gui/SeqCanvas.java
Jim Procter [Thu, 30 Aug 2018 15:34:58 +0000 (16:34 +0100)]
JAL-3092 release notes
Jim Procter [Thu, 30 Aug 2018 15:31:37 +0000 (16:31 +0100)]
JAL-3092 make sure base pair counter is always moved in loop that computes the helix count for a strand of RNA secondary structure
gmungoc [Thu, 30 Aug 2018 15:30:32 +0000 (16:30 +0100)]
Merge branch 'bug/JAL-247pngShowHiddenSeqMarks' into trialMerge
gmungoc [Thu, 30 Aug 2018 15:28:01 +0000 (16:28 +0100)]
JAL-3055 refinements to alternatives to deriveFont
gmungoc [Thu, 30 Aug 2018 15:27:33 +0000 (16:27 +0100)]
JAL-3079 don't create new Graphics to draw as it confuses PDFGraphics
Jim Procter [Wed, 29 Aug 2018 09:17:25 +0000 (10:17 +0100)]
JAL-3091 release notes for JAL-3003 JAL-3059
Jim Procter [Tue, 28 Aug 2018 16:11:48 +0000 (17:11 +0100)]
JAL-3003 different coloured borders in demo annotation file
gmungoc [Thu, 23 Aug 2018 12:28:52 +0000 (13:28 +0100)]
JAL-3059 use correct border colour for groups
gmungoc [Thu, 23 Aug 2018 12:27:10 +0000 (13:27 +0100)]
JAL-3003 draw selection group outline on main graphics context
gmungoc [Tue, 28 Aug 2018 15:55:58 +0000 (16:55 +0100)]
JAL-3055 corrected logo drawing in JS
Jim Procter [Tue, 28 Aug 2018 15:28:38 +0000 (16:28 +0100)]
JAL-247 release notes
gmungoc [Mon, 27 Aug 2018 09:19:28 +0000 (10:19 +0100)]
JAL-247 comment to clarify wrapped print algorithm
gmungoc [Fri, 24 Aug 2018 15:16:08 +0000 (16:16 +0100)]
JAL-247 print/export wrapped uses common code to draw seq ids and
annotation labels
gmungoc [Fri, 24 Aug 2018 14:32:44 +0000 (15:32 +0100)]
JAL-3087 include full alignment height in repeating wrapped height
gmungoc [Fri, 24 Aug 2018 09:06:41 +0000 (10:06 +0100)]
JAL-247 draw/print sequence ids now uses common code (unwrapped case)
Jim Procter [Tue, 28 Aug 2018 15:16:56 +0000 (16:16 +0100)]
JAL-3091 release 2.10.5 added to release notes
gmungoc [Tue, 28 Aug 2018 11:32:01 +0000 (12:32 +0100)]
JAL-3055 corrections to use of AffineTransform to scale characters
hansonr [Tue, 28 Aug 2018 03:43:18 +0000 (22:43 -0500)]
Button/mouse tests
hansonr [Tue, 28 Aug 2018 03:35:35 +0000 (22:35 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Tue, 28 Aug 2018 03:34:40 +0000 (22:34 -0500)]
JAL-3026 mouse event overhaul; Jmol working (some "black label" issue?
pull, build-site
hansonr [Mon, 27 Aug 2018 16:09:53 +0000 (11:09 -0500)]
JAL-3026 alignmentFrame.statusBar.setText -> .setStatus
Ben Soares [Mon, 27 Aug 2018 15:50:20 +0000 (16:50 +0100)]
JAL-3061 / JAL-3053
Fixed broken StockholmFileTest tests
curlyWUSSsecondaryStructureForRNASequence
fullWUSSsecondaryStructureForRNASequence
by adding " ." as a recognised Annotation.isWhiteSpace displayCharacter
(which happens for StockholmFile '.' RNA SS annotations)
gmungoc [Mon, 27 Aug 2018 14:30:25 +0000 (15:30 +0100)]
JAL-3055 restore original deriveFont code for Java runtime
hansonr [Mon, 27 Aug 2018 13:39:36 +0000 (08:39 -0500)]
Bob's site directory JAL-3026
gmungoc [Mon, 27 Aug 2018 09:19:28 +0000 (10:19 +0100)]
JAL-247 comment to clarify wrapped print algorithm
hansonr [Mon, 27 Aug 2018 08:36:29 +0000 (03:36 -0500)]
JAL-3026 Jmol functioning; some issues
Reworked mouse event handling. Temporarily lost out-of-frame business.
Or, more specifically, hovering over the scroll bar to auto-scroll.
gmungoc [Fri, 24 Aug 2018 15:16:08 +0000 (16:16 +0100)]
JAL-247 print/export wrapped uses common code to draw seq ids and
annotation labels
gmungoc [Fri, 24 Aug 2018 14:32:44 +0000 (15:32 +0100)]
JAL-3087 include full alignment height in repeating wrapped height
gmungoc [Fri, 24 Aug 2018 09:06:41 +0000 (10:06 +0100)]
JAL-247 draw/print sequence ids now uses common code (unwrapped case)
hansonr [Fri, 24 Aug 2018 07:35:44 +0000 (02:35 -0500)]
JAL-3026 Java bug associated with File/String mods
in AlignFrame lines 4586,4592
hansonr [Fri, 24 Aug 2018 07:26:06 +0000 (02:26 -0500)]
JAL-3026 GD#107,128,130,139 build-site.xml
JInternalFrame z-order issues resolved
EBIFeching via server proxy as no access-control-origin:*
Temp file creation by File.createTempFile
Jmol app fixes for virtual key issues and starting to display now. Still
not dynamic, though. (No mouse action)
URL downloads now allow checking of status code (actually a hack, just
200 or 404, but we can get access to the real code.
gmungoc [Thu, 23 Aug 2018 12:28:52 +0000 (13:28 +0100)]
JAL-3059 use correct border colour for groups
gmungoc [Thu, 23 Aug 2018 12:27:10 +0000 (13:27 +0100)]
JAL-3003 draw selection group outline on main graphics context
hansonr [Wed, 22 Aug 2018 16:32:03 +0000 (11:32 -0500)]
JAL-3026 GD#127 frame selection/toFront
Jim Procter [Wed, 22 Aug 2018 13:54:29 +0000 (14:54 +0100)]
JAL-2988 workaround for jalview save as dialogs - clear filename before displaying
Jim Procter [Wed, 22 Aug 2018 13:53:11 +0000 (14:53 +0100)]
JAL-2988 JAL-2976 update to latest VAqua release: VAqua5
hansonr [Wed, 22 Aug 2018 10:49:20 +0000 (05:49 -0500)]
JAL-3026 JavaScript tests moved to utils/test
gmungoc [Wed, 22 Aug 2018 10:31:04 +0000 (11:31 +0100)]
JAL-3049 JAL-3032 tidy/i18n code, remove redundant tooltip registration
hansonr [Tue, 21 Aug 2018 19:30:23 +0000 (14:30 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Tue, 21 Aug 2018 18:36:43 +0000 (13:36 -0500)]
JAL-3026 GD #118 tooltip not showing for components.
hansonr [Tue, 21 Aug 2018 18:36:43 +0000 (13:36 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)]
JAL-3026 Boolean upgrade to Java 8
hansonr [Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of
https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.2/SwingJS-site.zip
swingjs/ver/3.2.2/timestamp
hansonr [Tue, 21 Aug 2018 18:21:16 +0000 (13:21 -0500)]
JAL-3026 GD#137 Boolean upgrade requires build-site.xml only
hansonr [Tue, 21 Aug 2018 18:21:16 +0000 (13:21 -0500)]
JAL-3026 GD#137 Boolean upgrade requires build-site.xml only
hansonr [Tue, 21 Aug 2018 17:15:55 +0000 (12:15 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Tue, 21 Aug 2018 17:15:08 +0000 (12:15 -0500)]
JAL-3027 GD#140 checkbox/radio text alignment not coded in
JSRadioButtonUI - requires build-site.xml
gmungoc [Tue, 21 Aug 2018 13:59:50 +0000 (14:59 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
gmungoc [Tue, 21 Aug 2018 13:59:38 +0000 (14:59 +0100)]
JAL-3032 MCview package renamed mc_view in test classes
hansonr [Tue, 21 Aug 2018 13:00:09 +0000 (08:00 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Tue, 21 Aug 2018 12:59:38 +0000 (07:59 -0500)]
JAL-3026 fixes Jmol going into debug mode
much faster PDB file processing if it doesn't print every line as it
goes!
gmungoc [Tue, 21 Aug 2018 12:59:37 +0000 (13:59 +0100)]
JAL-2717 corrected i18n of colour scheme names
hansonr [Tue, 21 Aug 2018 12:14:33 +0000 (07:14 -0500)]
JAL-3026 fixes ?j2strace=xxx message, user.home, error msg in
ItentifiersUrlProvider
gmungoc [Tue, 21 Aug 2018 11:16:50 +0000 (12:16 +0100)]
JAL-3032 JAL-3084 test class for JS layout bug(s)
hansonr [Tue, 21 Aug 2018 05:00:16 +0000 (00:00 -0500)]
JAL-3026 JSONObject: removing annotation sensing
hansonr [Tue, 21 Aug 2018 04:33:09 +0000 (23:33 -0500)]
swingjs.JSSAXParser working for Jalview
hansonr [Tue, 21 Aug 2018 02:12:36 +0000 (21:12 -0500)]
JAL-3026 JmolData running; new run time and transpiler.
Run build-site.xml and possibly do a clean build.
hansonr [Tue, 21 Aug 2018 02:10:41 +0000 (21:10 -0500)]
mc_view references were MCview
hansonr [Tue, 21 Aug 2018 02:09:25 +0000 (21:09 -0500)]
JAL-3026 MCview -> mc_view
SwingJS requires standard package and class capitalization;
_ added to avoid PC capitalization issue
hansonr [Mon, 20 Aug 2018 15:24:19 +0000 (10:24 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Mon, 20 Aug 2018 15:23:49 +0000 (10:23 -0500)]
JAL-3026 j2sClazz.js fixes
// BH 8/20/2018 3.2.2.04 adds character.isJavaIdentifierPart$C and
several Character...$I equivalents
// BH 8/19/2018 3.2.2.04 fixes Enum .name being .$name
// BH 8/16/2018 3.2.2.04 fixes Character.toTitleCase$C,
[Integer,Long,Short,Byte].toString(i,radix)
gmungoc [Mon, 20 Aug 2018 12:52:46 +0000 (13:52 +0100)]
JAL-3032 Feature Settings menu item always enabled (restored)
gmungoc [Mon, 20 Aug 2018 10:52:01 +0000 (11:52 +0100)]
JAL-3032 variant of Sequence Details panel for JalviewJS
gmungoc [Mon, 20 Aug 2018 09:57:09 +0000 (10:57 +0100)]
JAL-3084 force EPS output to "Text" for JalviewJS
gmungoc [Mon, 20 Aug 2018 09:32:14 +0000 (10:32 +0100)]
JAL-3084 hide startup file, Chimera, HTML/SVG, Web Services options/tab
in JalviewJS
hansonr [Mon, 20 Aug 2018 05:39:18 +0000 (00:39 -0500)]
Adds org.json (along with "org.json.simple") for
jalview.io.JSONFile.java
hansonr [Mon, 20 Aug 2018 04:23:06 +0000 (23:23 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Mon, 20 Aug 2018 04:22:24 +0000 (23:22 -0500)]
fixes for anonymous classes; preliminary Jmol classes
Problem: anonymous classes that reference superclass finals may not
escape them properly with $. (drag-drop of PDB file)
Jmol classes into libjs, but not working yet, since we need to now
distinguish between JavaScript/AWT for application and JavaScript/noAWT
for standard JSmol applet
gmungoc [Fri, 17 Aug 2018 13:57:49 +0000 (14:57 +0100)]
JAL-3048 remove obsolete way of handling dialogs in JalviewJS
gmungoc [Fri, 17 Aug 2018 13:57:12 +0000 (14:57 +0100)]
JAL-3048 adapt 'input from URL' dialog for JalviewJS
gmungoc [Fri, 17 Aug 2018 10:38:33 +0000 (11:38 +0100)]
JAL-3038 unit test updates for JalviewJS workaround hack
gmungoc [Thu, 16 Aug 2018 14:07:35 +0000 (15:07 +0100)]
JAL-3038 workaround to replace editable combobox with text field in JS
hansonr [Thu, 16 Aug 2018 13:13:45 +0000 (08:13 -0500)]
JAL-3026 Character.toUpperCase
hansonr [Thu, 16 Aug 2018 12:55:30 +0000 (07:55 -0500)]
JAL-3026 SwingJS-site.zip fix
gmungoc [Thu, 16 Aug 2018 09:08:49 +0000 (10:08 +0100)]
Merge branch 'bug/JAL-3082selectRegex' into Jalview-BH/JAL-3026
gmungoc [Thu, 16 Aug 2018 09:00:07 +0000 (10:00 +0100)]
JAL-3082 one more test condition
gmungoc [Thu, 16 Aug 2018 08:56:36 +0000 (09:56 +0100)]
JAL-3082 handle regex error, exclusive threshold, unit tests
hansonr [Thu, 16 Aug 2018 02:11:55 +0000 (21:11 -0500)]
Java2Script 3.2.2_04 fixes Clazz._exceptionOf P$ issue
gmungoc [Wed, 15 Aug 2018 11:17:27 +0000 (12:17 +0100)]
JAL-3048 use JS-compatible JvOptionPane method
gmungoc [Wed, 15 Aug 2018 10:02:47 +0000 (11:02 +0100)]
Merge branch 'feature/JAL-3080clearTreeGroups' into Jalview-BH/JAL-3026
gmungoc [Wed, 15 Aug 2018 10:01:27 +0000 (11:01 +0100)]
JAL-3080 remove tree partition if no groups created
gmungoc [Tue, 14 Aug 2018 15:55:13 +0000 (16:55 +0100)]
JAL-3078 reset Tree font (only!) on Cancel
gmungoc [Tue, 14 Aug 2018 13:04:06 +0000 (14:04 +0100)]
JAL-3032 tidy AlignmentProperties display for JalviewJS
gmungoc [Tue, 14 Aug 2018 10:04:02 +0000 (11:04 +0100)]
JAL-3056 no Save/Load colours xml in JalviewJS
hansonr [Sun, 12 Aug 2018 12:27:30 +0000 (07:27 -0500)]
JAL-3026 refines, generalizes build-site.xml
hansonr [Sun, 12 Aug 2018 12:21:37 +0000 (07:21 -0500)]
JAL-3026 refines, generalizes build-site.xml
hansonr [Sun, 12 Aug 2018 11:37:05 +0000 (06:37 -0500)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Sun, 12 Aug 2018 05:19:01 +0000 (00:19 -0500)]
Java2Script 3.2.2 upgrade
gmungoc [Thu, 26 Jul 2018 15:42:14 +0000 (16:42 +0100)]
JAL-3026 major update 1/2
- Java2Script 3.2.2 Java 8 ready
- fix for scrollbar returning 3.
99999996 instead of 4
- fix for checkboxes too low
- drop in new transpiler
- run eclipsec -clean
- run build-site.xml
gmungoc [Fri, 10 Aug 2018 15:44:24 +0000 (16:44 +0100)]
JAL-3056 suppress Lineart option in JalviewJS
gmungoc [Fri, 10 Aug 2018 10:59:33 +0000 (11:59 +0100)]
JAL-3018 updated to Ensembl REST 7.0
gmungoc [Fri, 10 Aug 2018 10:58:00 +0000 (11:58 +0100)]
JAL-3076 refactor for more efficient scan of 'gene' features
gmungoc [Fri, 10 Aug 2018 09:59:42 +0000 (10:59 +0100)]
JAL-3076 fetch Ensembl sequence as JSON instead of Fasta
Ben Soares [Fri, 3 Aug 2018 16:00:50 +0000 (17:00 +0100)]
JAL-3061
Added test StockholmFileTest.stockholmFileRnaSSSpaceChars() to read in
RNA SS annotation with spaces, and check that StockholmFile print output
converts these to '.'s.
Also slight adjustment to StockholmFile.outputCharacter to avoid a
nullPointer exception.
Ben Soares [Fri, 3 Aug 2018 14:17:56 +0000 (15:17 +0100)]
Merge branch 'bug/JAL-3061_RNA_secondary_structure_annotation_gap_character' of https://source.jalview.org/git/jalview into bug/JAL-3061_RNA_secondary_structure_annotation_gap_character
Ben Soares [Thu, 2 Aug 2018 16:30:15 +0000 (17:30 +0100)]
JAL-3053
JAL-3061
two bugs with a similar theme (RNA secondary structure annotations)
JAL-3053
This fixes the reading in of Vienna extended dot-bracket notation for
RNA secondary structure annotations (which includes ALPHA/alpha braces).
To avoid (almost all) ambiguity with a protein secondary structure
annotation (Es and Hs), there's a whole-annotation regex match to ensure
some other RNA-based extended dot-bracket feature is present, and then
the reading in can assume an RNA feature set.
Test StockholmFileTest.stockholmFileRnaSSAlphaChars() compares the test
file examples/rna_ss_test.stk with a hard-coded Jalview equivalent. The
Annotation rnasecstr pairing is checked. I've added a sort Comparator
for SequenceFeature to help ensure that check is correct.
--
JAL-3061
There is also a fix for the RNA Secondary Structure annotation output
that was preserving spaces in the output. This is not valid output in
this case, and so a '.' is used instead.
No test for this yet, will add later.
Jim Procter [Wed, 1 Aug 2018 10:33:17 +0000 (11:33 +0100)]
Merge branch 'releases/Release_2_10_4_Branch' into bug/JAL-3061_RNA_secondary_structure_annotation_gap_character
Jim Procter [Wed, 1 Aug 2018 10:32:08 +0000 (11:32 +0100)]
Merge branch 'task/JAL-3047_clover2104b1_cherrypick' into releases/Release_2_10_4_Branch
Jim Procter [Thu, 19 Jul 2018 15:36:30 +0000 (16:36 +0100)]
JAL-3047 don't set classes unconditionally (forgot to delete it in earlier patch)