gmungoc [Tue, 30 Jun 2020 11:12:09 +0000 (12:12 +0100)]
JAL-3446 unused imports removed
gmungoc [Thu, 18 Jun 2020 14:43:51 +0000 (15:43 +0100)]
JAL-3648 resize annotation panel after dragging to resize graph height
Jim Procter [Mon, 29 Jun 2020 17:39:41 +0000 (18:39 +0100)]
JAL-3493 fix patch for 2.11.1_js (nb - these changes should not be merged to 2.11.2!)
Jim Procter [Mon, 29 Jun 2020 16:46:57 +0000 (17:46 +0100)]
JAL-3675 2.11.1.1 release notes
Jim Procter [Mon, 29 Jun 2020 16:24:29 +0000 (17:24 +0100)]
JAL-3493 clear search highlights when escape/deselect all
Conflicts:
src/jalview/gui/AlignFrame.java
patch migrated to src/jalview/gui/AligmentPanel.java
Jim Procter [Mon, 29 Jun 2020 16:19:19 +0000 (17:19 +0100)]
JAL-3493 failing test - creates a highlight and column selection and then called the deselect all alignfjame action and checks if highlight and selection are still present.
Conflicts:
test/jalview/gui/SeqCanvasTest.java
BobHanson [Thu, 18 Jun 2020 16:00:32 +0000 (11:00 -0500)]
JAL-3659 unnecessary duplication -- test is made in previous block
BobHanson [Thu, 18 Jun 2020 15:57:28 +0000 (10:57 -0500)]
JAL-3446 unintentially left training message in code.
Jim Procter [Wed, 17 Jun 2020 12:49:24 +0000 (13:49 +0100)]
JAL-3662 JAL-3660 JAL-3561 source formatting
Jim Procter [Wed, 17 Jun 2020 12:24:09 +0000 (13:24 +0100)]
Merge branch 'cherrypicks/JAL-3660_JAL-3561_JAL-3662_cli_outputformat' into Jalview-JS/develop
Jim Procter [Tue, 16 Jun 2020 16:12:54 +0000 (17:12 +0100)]
JAL-3660 JAL-3561 output alignment as requested file format as validated by FileFormats - report if format cannot be resolved or FileFormatI does not support export.
Merged jbp patch for 2.11.1.0 to rhanson's Jalview-JS/develop reworking of args parsing
Jim Procter [Tue, 16 Jun 2020 16:11:32 +0000 (17:11 +0100)]
JAL-3561 JAL-3660 check resolved FileFormatI instances are equivalent to verify format is as expected in test
Jim Procter [Fri, 20 Mar 2020 13:12:39 +0000 (13:12 +0000)]
JAL-3561 failing test verifying expected fileformat produced during commandlineoperation tests
BobHanson [Tue, 16 Jun 2020 23:09:57 +0000 (18:09 -0500)]
JAL-3659 proper headless check; skips setProperty for JS
BobHanson [Tue, 16 Jun 2020 23:00:51 +0000 (18:00 -0500)]
JAL-3662 simple fix for CLI not using right format for output of
alignment.
BobHanson [Tue, 16 Jun 2020 12:51:05 +0000 (07:51 -0500)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Tue, 16 Jun 2020 12:44:20 +0000 (07:44 -0500)]
JAL-3446 -- YEIKS! two checkURLLinks calls!
gmungoc [Tue, 16 Jun 2020 12:00:49 +0000 (13:00 +0100)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
gmungoc [Tue, 16 Jun 2020 12:00:29 +0000 (13:00 +0100)]
JAL-3583 better handling of null or empty tooltip on annotation
gmungoc [Tue, 16 Jun 2020 11:47:12 +0000 (12:47 +0100)]
JAL-3446 defer size calculations until panel added to window
BobHanson [Tue, 16 Jun 2020 11:23:01 +0000 (06:23 -0500)]
JAL-3446 proper call for headless state
BobHanson [Tue, 16 Jun 2020 04:23:26 +0000 (23:23 -0500)]
JAL-3446 CommandLineOperation test
- cleaner headless check when adding JInternalFrame to Desktop
instance.
BobHanson [Tue, 16 Jun 2020 03:07:02 +0000 (22:07 -0500)]
JAL-3446 CommandLineOperation test
- headless check must be before Desktop.getInstance(), as you can't
make an instance of JFrame() when headless.
BobHanson [Tue, 16 Jun 2020 03:05:44 +0000 (22:05 -0500)]
JAL-3446 CTRL-DOWN check for headless operation
BobHanson [Mon, 15 Jun 2020 17:55:05 +0000 (12:55 -0500)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Mon, 15 Jun 2020 17:54:52 +0000 (12:54 -0500)]
JAL-3657 SwingJS HashMap.putEntries() coding mistake.
soares [Mon, 15 Jun 2020 14:21:01 +0000 (15:21 +0100)]
JAL-3658 Now only making cores from utils/jalviewjs/classlists/*.txt
gmungoc [Mon, 15 Jun 2020 09:20:15 +0000 (10:20 +0100)]
JAL-3446 breaking change redacted
gmungoc [Mon, 15 Jun 2020 07:24:41 +0000 (08:24 +0100)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Sun, 14 Jun 2020 03:10:54 +0000 (22:10 -0500)]
JAL-3445 BSML BBB file format.
- merge of BSML test branch.
- includes BSMLFileTest
- preliminary; does not read complement
- See Jalview-JS/develop/temp/bbb.dtd.pdf
BobHanson [Sun, 14 Jun 2020 02:42:30 +0000 (21:42 -0500)]
JAL-3653 SwingJS support for indeterminate JProgressBar
BobHanson [Sat, 13 Jun 2020 21:37:52 +0000 (16:37 -0500)]
JAL-3487 Splash screen
- cleaner code, more comments
- adds SwingJS support for 1-ms image finalization
(using JSToolkit.dispatch instead of invokeLater
BobHanson [Sat, 13 Jun 2020 17:30:28 +0000 (12:30 -0500)]
JAL-3487 Splash screen
- JS now uses StateMachine
- simple example of how StateMachine works.
BobHanson [Sat, 13 Jun 2020 14:41:14 +0000 (09:41 -0500)]
Merge branch 'Jalview-JS/develop.JAL-3445-BSML-reader' into Jalview-JS/develop
BobHanson [Fri, 12 Jun 2020 14:02:20 +0000 (09:02 -0500)]
JAL-3446 SwingJS update
-fixes desktop frame not taking focus when clicked, so not processing
menu shortcuts
BobHanson [Fri, 12 Jun 2020 13:32:44 +0000 (08:32 -0500)]
JAL-3664 shortcuts in Desktop not working from AlignFrame
- missing test for JInternalFrame in JComponent.processKeyBindings
soares [Fri, 12 Jun 2020 11:24:55 +0000 (12:24 +0100)]
JAL-3446 fixing a bad merge, sorry
soares [Fri, 12 Jun 2020 11:15:32 +0000 (12:15 +0100)]
JAL-3446 separated out potential exceptions for simplified key mask operation
BobHanson [Fri, 12 Jun 2020 08:45:06 +0000 (03:45 -0500)]
JAL-3446 removing mouse button test debug
BobHanson [Fri, 12 Jun 2020 06:12:29 +0000 (01:12 -0500)]
SwingJS upgrade fixes AlignmentPanel keyPressed not called
- ContentPane was getting the message, not JInternalFrame
BobHanson [Fri, 12 Jun 2020 05:31:52 +0000 (00:31 -0500)]
JAL-3446 from applet -- reload; also fixes some repaint issues
gmungoc [Thu, 11 Jun 2020 15:11:48 +0000 (16:11 +0100)]
JAL-3624 code tidy
gmungoc [Thu, 11 Jun 2020 15:04:48 +0000 (16:04 +0100)]
JAL-3624 unneeded import removed
BobHanson [Thu, 11 Jun 2020 13:37:11 +0000 (08:37 -0500)]
JAL-3446 misplaced } removed drop and window listeners from JS
BobHanson [Thu, 11 Jun 2020 13:34:37 +0000 (08:34 -0500)]
JAL-3446 no need for SHIFT_DOWN or ALT_DOWN masks
BobHanson [Thu, 11 Jun 2020 12:19:17 +0000 (07:19 -0500)]
First try at merging didn't go so well.
BobHanson [Thu, 11 Jun 2020 12:13:36 +0000 (07:13 -0500)]
Merge branch 'Jalview-JS/develop.JAL-3446.ctrlDown' into
Jalview-JS/develop
Conflicts:
src/jalview/bin/JalviewJS2.java
src/jalview/gui/Desktop.java
src/jalview/util/Platform.java
BobHanson [Thu, 11 Jun 2020 00:40:52 +0000 (19:40 -0500)]
JAL-3446, JAL-3647 after first successful test run;
removing debug messages
BobHanson [Wed, 10 Jun 2020 22:49:51 +0000 (17:49 -0500)]
Bamboo #36 checking component sizes
BobHanson [Wed, 10 Jun 2020 21:03:42 +0000 (16:03 -0500)]
Bamboo text #35 - simpler logic; avoids impossible repaint, validation?
BobHanson [Wed, 10 Jun 2020 18:18:43 +0000 (13:18 -0500)]
Bamboo test #3 The problem is not threading. It is feedback from
ViewportRanges to AlignmentPanel from trying to set the ranges to
invalid values.
BobHanson [Wed, 10 Jun 2020 17:48:37 +0000 (12:48 -0500)]
Bamboo test - setting method priorities
BobHanson [Wed, 10 Jun 2020 17:24:58 +0000 (12:24 -0500)]
Bamboo test 2 -- threads and stacktrace
BobHanson [Wed, 10 Jun 2020 17:05:25 +0000 (12:05 -0500)]
So close! Bamboo test
BobHanson [Wed, 10 Jun 2020 16:31:05 +0000 (11:31 -0500)]
JAL-3446 JAL-3645 tooltip testing not intended to be checked in.
BobHanson [Wed, 10 Jun 2020 16:28:56 +0000 (11:28 -0500)]
JAL-3645 errant "g" in JavaDoc
BobHanson [Wed, 10 Jun 2020 15:52:59 +0000 (10:52 -0500)]
JAL-3446 from applet, JAL-3584 tooltip fixes <br> and allows different
html style coding for Java and JavaScript
BobHanson [Wed, 10 Jun 2020 15:48:17 +0000 (10:48 -0500)]
JAL-3446 SwingJS upgrade for html labels and tooltips preferred size fix
- adds display:inline-block to label spans
- better testing for isHTML in labels
gmungoc [Wed, 10 Jun 2020 09:14:13 +0000 (10:14 +0100)]
JAL-3446 more tweaks to tests failing on build server
gmungoc [Wed, 10 Jun 2020 08:59:39 +0000 (09:59 +0100)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Wed, 10 Jun 2020 05:22:18 +0000 (00:22 -0500)]
JAL-3446 tests - Popup/HTML changes in Applet
- <br> indicates no additional line breaks.
- removal of unrealistic tests ("false" tests of jws2Discoverer HTML
messages)
- accepts either <br> or <br/> (as does JLabel)
BobHanson [Wed, 10 Jun 2020 05:03:22 +0000 (00:03 -0500)]
JAL-3446 AlignViewportTest
- optionally stops jabaws checking interference; Allows a bit more time,
for calculation to start, I think.
- passing 8 times in a row
BobHanson [Wed, 10 Jun 2020 03:07:59 +0000 (22:07 -0500)]
JAL-3446 Dynamic menu - Moves calc sortby tree item creation to opening
of its submenu, rather than the upper-level sort menu.
- suggestion only; changes setVisible to setEnabled, more along the
lines of standard practice (?)
- allows for a simple change from "enabled" to "visible" if desired, but
still leaves the submenu creation in its most proximate location.
BobHanson [Wed, 10 Jun 2020 03:01:04 +0000 (22:01 -0500)]
JAL-3446 SwingJS-site.zip for dynamic menus
- adds missing mouse-event bindings to all
dynamically created menu items
immediately after return from menuSelected event
- fixes issue of menus too eager to close
BobHanson [Tue, 9 Jun 2020 21:32:02 +0000 (16:32 -0500)]
JAL-3446 problem with Select-Find tooltip
- Just too complex to allow wrapping AND <br> tags.
- Compromise is to not worry about "maximum length" if "<br>" is used.
- Assumption is that if you took the time to put in a <br> you expect
that to be where (and only where) the line breaks are and also to define
the width of the tooltip
- adds a thin border around the tooltip text.
BobHanson [Tue, 9 Jun 2020 21:29:00 +0000 (16:29 -0500)]
JAL-3446 proposed dropdown fix
- 100 ms delay for opening
- proper toggle operation for button
- all actions on mouseup
- tooltips open and close appropriately
gmungoc [Tue, 9 Jun 2020 15:08:28 +0000 (16:08 +0100)]
JAL-3446 tearDown to fix unit test fail
BobHanson [Tue, 9 Jun 2020 06:55:57 +0000 (01:55 -0500)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Tue, 9 Jun 2020 06:42:17 +0000 (01:42 -0500)]
JAL-3446 from applet; JAL-3374
- JalviewJSApp interface updated
- Jalview "noannotations" fixed
- AlignFrame show annotations menu item when started with noannations
fixed
- reorganization of timing of setting range start/end and scrollbar
values solves (many) timing issues in SeqCanvasTest and
AlignmentPanelTest, which were due to asynchronous delayed repaints
setting range values in paintComponent(g) way too late.
- correction of font checking in AlignmentPanelTest - "VERY LONG LABEL"
not long enough after adding "MMMM" in a prior test
- corrections for "isMac()" (now "!isWin()") in tests
- addition of Jalview.isInteractive for SeqCanvasTest -- still an
occasional conflict with previous test when in batch mode
- addition of Jalview.allowServices for simple tests (using -jabaws
"none"), allowing them to not run unnecessary service look-up threads
- centralization of AlignmentViewport firing of "alignment" property
change for sanity only
- adding of "sequence" property change for notification of need to
refresh the horizontal scrollbar after changes in range and scrollbar
update timing
- still a minor issue with noannotation starting up ok, but the first
annotation spilling over into scrollbar space (is that a filler?)
BobHanson [Tue, 9 Jun 2020 06:25:37 +0000 (01:25 -0500)]
JAL-3446 from applet - Cache news date fix
- US time stored differently, I guess.
BobHanson [Tue, 9 Jun 2020 06:24:40 +0000 (01:24 -0500)]
JAL-3446 from JAL-3253-applet SequenceFetcher.getInstance()
BobHanson [Tue, 9 Jun 2020 06:20:53 +0000 (01:20 -0500)]
JAL-3446 from JAL-3253-applet Tree Canvas bug fix
- was possible to right-click off the node to get a NullPointer
exception.
soares [Mon, 8 Jun 2020 13:39:17 +0000 (14:39 +0100)]
JAL-3446 old j8lib Jmol-14.29.17.jar removed. SHOULD NOT BE CHERRY-PICKED TO develop or release UNTIL JAL-3595 RESOLVED
soares [Mon, 8 Jun 2020 13:36:41 +0000 (14:36 +0100)]
JAL-3446 new Jmol 15.1.3 jar added to j11lib, old j11lib Jmol-14.29.17-no_netscape.jar removed
BobHanson [Mon, 8 Jun 2020 04:24:29 +0000 (23:24 -0500)]
JAL-3446 minor SwingJS-site.zip fixes; Assets.
BobHanson [Sun, 7 Jun 2020 23:39:37 +0000 (18:39 -0500)]
JAL-3446 AppletParams
BobHanson [Sun, 7 Jun 2020 18:27:42 +0000 (13:27 -0500)]
JAL-3446 rearranged parameters for JalviewJS API methods
BobHanson [Sun, 7 Jun 2020 18:09:26 +0000 (13:09 -0500)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Sun, 7 Jun 2020 18:00:11 +0000 (13:00 -0500)]
JAL-3446 reorganized JalviewJSApp (accidentally put that in jalview/api)
and
fixes for 2-applet example
- API.md
- follows commit 01717e2 (missing JAL-3446 tag)
BobHanson [Sun, 7 Jun 2020 18:00:11 +0000 (13:00 -0500)]
reorganized JalviewJSApp (accidentally put that in jalview/api) and
fixes for 2-applet example
BobHanson [Sun, 7 Jun 2020 04:06:11 +0000 (23:06 -0500)]
JAL-3446 differences.txt now delivered with SwingJS-site.zip
BobHanson [Sun, 7 Jun 2020 04:05:16 +0000 (23:05 -0500)]
JAL-3446 JavaScript interface
- testing with two apps on a page
- now requires Jalview1.getApp().xxxx, not just Jalview1.app, because a
call is needed to ensure that ThreadGroup is set correctly.
- still working on this...
BobHanson [Sun, 7 Jun 2020 04:00:36 +0000 (23:00 -0500)]
JAL-3446 Desktop fix for embedding
BobHanson [Sat, 6 Jun 2020 22:37:22 +0000 (17:37 -0500)]
JAL-3446 no actual changes; just using meaningful frame options
BobHanson [Sat, 6 Jun 2020 17:36:34 +0000 (12:36 -0500)]
JAL-3446 adds Jmol viewer embedding.
BobHanson [Sat, 6 Jun 2020 17:23:19 +0000 (12:23 -0500)]
JAL-3446 adds Jmol viewer embedding.
BobHanson [Sat, 6 Jun 2020 13:24:32 +0000 (08:24 -0500)]
Jmol 15.1.3 rebuilt
BobHanson [Sat, 6 Jun 2020 13:13:33 +0000 (08:13 -0500)]
JAL-3379 JalviewJS-API specs - preliminary
BobHanson [Fri, 5 Jun 2020 22:09:46 +0000 (17:09 -0500)]
JAL-3446 embedded file for proper name matching
web app name "Jalview"
div id="Jalview-desktop-div"
So whatever name you give the applet must match the div tags.
Previously, the div name was associated with a different name,
Info.j2sAppID, or something like that. This is much more sensible.
Just don't name it "jalview", because that is a package name!
BobHanson [Fri, 5 Jun 2020 21:46:09 +0000 (16:46 -0500)]
JAL-3446 UrlDownloadClient and Test
- moving download to Platform
- trivializing JavaScript method
- expanding SwingJS to allow for nio methods
Note: SwingJS preserves byte[] in the File, Path, or FileOutputStream
objects as well as in J2S._javaFileCache. Because of that, one thing you
have to look out for is stale references. In this case, we have:
temp = new Path(...);
fos = new FileOutputStream(temp.toString);
now two independent pointers both refer to the tmp file.
rbc = new
ReadableByteChannel(url.openStream());
fos.getChannel().transferFrom(rbc);
Now the bytes are in fos's channel, but they are not associated yet with
"tmp".
Files.copy(tmp, outfile);
This wasn't working in JavaScript, because Path tmp was out of date, and
so no bytes were being copied.
Working now, but still far to complicated for the simple operation of
transferring bytes from an InputStream to a File in JavaScript.
BobHanson [Fri, 5 Jun 2020 16:33:19 +0000 (11:33 -0500)]
JAL-3446 Desktop JS needs getIdentifiersOrgData();
BobHanson [Fri, 5 Jun 2020 15:35:23 +0000 (10:35 -0500)]
JAL-3446 forgot to escape Java in modified Platform.getAppID
BobHanson [Fri, 5 Jun 2020 15:22:33 +0000 (10:22 -0500)]
JAL-3446 new Locale("") moved to Platform for review.
BobHanson [Fri, 5 Jun 2020 14:30:55 +0000 (09:30 -0500)]
JAL-3446 AlignmentSorter/Test more documentation; bit cleaner code
BobHanson [Fri, 5 Jun 2020 13:46:03 +0000 (08:46 -0500)]
JAL-3446 AlignmentSorter/Test fixed for instance
BobHanson [Fri, 5 Jun 2020 12:38:09 +0000 (07:38 -0500)]
JAL-3446 removes all JalviewJSApp dependency from jalview.bin.Jalview;
cleans up logic in Jalview.doMain
BobHanson [Fri, 5 Jun 2020 05:54:10 +0000 (00:54 -0500)]
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
BobHanson [Fri, 5 Jun 2020 05:53:39 +0000 (00:53 -0500)]
Refactoring of Jalview, JalviewAppLoader, JalviewApp, various
applet-related interfaces
- makes JalviewJSApp the JavaScript interface "app" class
- removes JS interface from Jalview
- removes JalviewAppLoader and associated duplication of classes
- adds JavaScript selection and "oninit" listeners (untested)
BobHanson [Fri, 5 Jun 2020 05:51:07 +0000 (00:51 -0500)]
SwingJS upgrade for JSUtil and JSUtilI
BobHanson [Fri, 5 Jun 2020 05:26:32 +0000 (00:26 -0500)]
JAL-3446 new Jmol 15.1.3 jar
- into j8lib
- removes netscape package dependence