hansonr [Tue, 2 Jul 2019 12:34:02 +0000 (14:34 +0200)]
JAL-3253 AlignmentPanel opaque white may provide white earlier?
hansonr [Tue, 2 Jul 2019 12:32:19 +0000 (14:32 +0200)]
JAL-3253 simpler coding using MouseAdapter. Using JLabel.setOpaque(true)
to minimize unnecessary layout of status label.
hansonr [Tue, 2 Jul 2019 12:30:50 +0000 (14:30 +0200)]
JAL-3253 Jalview2XML minor recoding; suggesting InvokeLater rather than
InvokeAndWait to allow some asynchronous updating
hansonr [Tue, 2 Jul 2019 12:14:13 +0000 (14:14 +0200)]
new _j2sclasslist.txt for tab-focus
hansonr [Thu, 23 May 2019 01:05:38 +0000 (20:05 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Wed, 22 May 2019 13:15:03 +0000 (08:15 -0500)]
Jalview-JS/JAL-3253-applet newick Regex coding error fix JAL-3271
hansonr [Wed, 22 May 2019 13:15:03 +0000 (08:15 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of
https://source.jalview.org/git/jalview.git into
Jalview-JS/JAL-3253-applet
Conflicts:
src/jalview/project/Jalview2XML.java
hansonr [Wed, 22 May 2019 08:29:07 +0000 (03:29 -0500)]
Jalview-JS/JAL-3253-applet also comments relating to JAL-3268
hansonr [Wed, 22 May 2019 08:29:07 +0000 (03:29 -0500)]
Jalview-JS/JAL-3253-applet fix for original desktop, centralizing regex
and loadStaticResource
hansonr [Tue, 21 May 2019 11:56:04 +0000 (06:56 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
gmungoc [Tue, 21 May 2019 10:29:59 +0000 (11:29 +0100)]
JAL-3253-applet disabling button size setting by applet param. Whatever
this should do in Java, it doesn't seem to do, and it looks better in
JavaScript just to let the button set its own size.
gmungoc [Tue, 21 May 2019 10:29:59 +0000 (11:29 +0100)]
JAL-3253 code tidies and tweaks to Desktop
gmungoc [Mon, 20 May 2019 11:10:33 +0000 (12:10 +0100)]
JAL-2176 unused MenuChooser removed
hansonr [Sun, 19 May 2019 05:24:48 +0000 (00:24 -0500)]
Jalview-JS/JAL-3253-applet JAL-3192 secondary core files
buildcore now creates core_stevesoft (350K uncompressed) and core_jvjmol
(2.9M uncompressed)
Still needs some tweaking, but the process is relatively
straightforward:
1) To know what files to include, make sure you are using the core
version of the html file, and, after exercizing the program, issue:
J2S._saveFile('_j2sclasslist.txt',
Clazz.ClassFilesLoaded.sort().join('\n'))
(Sorry, I could make that simpler, I know.)
2) add a section in buildcore.xml that concatenates the desired file set
and turns that into a core file.
3) in the FIRST class loaded for this option, add something like this
static block:
static
{
/**
* This is the entry class. Load the core file directly, if it
exists. See
* buildcore.xml.
*
*
* @j2sNative
*
* swingjs.JSUtil.loadStaticResource$S("core/core_stevesoft.z.js");
*/
}
3) run buildcore.xml
2)
hansonr [Sun, 19 May 2019 04:27:59 +0000 (23:27 -0500)]
Jalview-JS/JAL-3253-applet core file comment -- Regex() call
hansonr [Sun, 19 May 2019 03:35:43 +0000 (22:35 -0500)]
Jalview-JS/JAL-3253-applet Creating
site/swingjs/j2s/com/stevesoft/core.js
Applying a simple trick to use a custom core file.
1) In buildcore.xml:
<!-- concatentate the stevesoft files -->
<concat destfile="${site.path}/j2s/com/stevesoft/core.js">
<fileset dir="${site.path}/j2s/com/stevesoft">
<include name="**/*.js" />
<exclude name="core.js" />
<exclude name="Regex.js" />
</fileset>
</concat>
<antcall target="call-core">
<param name="call-core.name" value="_stevesoft" />
<param name="call-core.list" value="com/stevesoft/core.js" />
</antcall>
2) In com/stevesoft, add a line that loads j2s/core/core_stevesoft.z.js
static
{
/**
* @j2sNative
*
* swingjs.JSUtil.loadStaticResource$S("core/core_stevesoft.z.js");
*/
}
hansonr [Sun, 19 May 2019 03:35:43 +0000 (22:35 -0500)]
Jalview-JS/JAL-3253-applet SwingJS-site.zip update
hansonr [Sun, 19 May 2019 03:35:12 +0000 (22:35 -0500)]
Jalview-JS/JAL-3253-applet update for core_jalview
hansonr [Sun, 19 May 2019 03:34:19 +0000 (22:34 -0500)]
Jalview-JS/JAL-3253-applet adds AlignFrameI empty interface to allow
JalviewLiteJSApi to serve with jalview.gui.AppletFrame as well as
jalview.appletgui.AppletFrame.
hansonr [Sat, 18 May 2019 22:27:10 +0000 (17:27 -0500)]
Jalview-JS/JAL-3253-applet fixes SwingJS-zip.js issue with frames
disappearing
In swingjs/plaf/JSFrameUI, "Desktop" should be "DesktopPane"
hansonr [Sat, 18 May 2019 06:16:14 +0000 (01:16 -0500)]
Jalview-JS/JAL-3253-applet adds shell JalviewJSApi methods to Jalview
A starting point for introducing a JavaScript API for Jalview.
JalviewApplet.js now automatically creates a "LiveConnect-like" set
of unqualified methods when the main class has a getInstance()
method, using reflection to get that instance's method list and
then using that list to create an interface that allows
overloading of methods (as long as they have a different arity.
So, for example, if Jalview is started as the "jalview1" applet
(using the <applet> or <jvapplet> tag), then we have:
Jalview1.setSelectionListener(alignFrame, listener)
Jalview1.setSelectionListener(listener)
and about 50 other methods.
To keep this simple, all methods that are not private, not
static, and that do not start with $ are included in the interface.
hansonr [Fri, 17 May 2019 18:45:28 +0000 (13:45 -0500)]
Jalview-JS/JAL-3253-applet more argument parsing
trying to simplify the sourcing of parametric data:
applet origin: <applet><param>
application origin: Info.args
preference file origin: Info.XXXX_YYYY
Close to full implementation of all three.
Next: Moving Jalview API to a jointly accessible class for Jalview(JS) and JalviewLite (deprecated, but still there).
hansonr [Fri, 17 May 2019 18:41:49 +0000 (13:41 -0500)]
Jalview-JS/JAL-3253-applet more argument parsing
allows for web component <jvapplet> as well as deprecated <applet>
adds applets-nocore.html for testing;
sets applets.html to be with core loading, for demo.
hansonr [Fri, 17 May 2019 13:26:33 +0000 (08:26 -0500)]
Jalview-JS/JAL-3253-applet additional static final preferences
hansonr [Fri, 17 May 2019 12:22:49 +0000 (07:22 -0500)]
Jalview-JS/JAL-3253-applet additional static final preferences
Consolidates UserDefinedColours.USER_DEFINED_COLOURS and
Preferences.USER_DEFINED_COLOURS
hansonr [Fri, 17 May 2019 04:59:29 +0000 (23:59 -0500)]
Jalview-JS/JAL-3253-applet adding more applet parameters and setting
more static final constants
Three types of parameters are being read:
1. Property file values, from Info.Jalview_XXX_XXXX:
Info.Jalview_ENABLE_SPLIT_FRAME = true;
2. Applet parameters:
<applet><param name="enableSplitPane" value="true">...</applet>
3. Jalview Command-line parameters:
Info.args='open "xxxxx.fa" ....'
hansonr [Thu, 16 May 2019 19:54:27 +0000 (14:54 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Thu, 16 May 2019 18:32:18 +0000 (13:32 -0500)]
Jalview-JS/JAL-3253-applet JAL-3266 Varna fix.
For some reason, the JPopupMenu was being added to the JPanel with
Component.add(), and then removed with Component.removeAll()
-- during the painting process. This caused it to appear on the
window as its unstyled <ul><li>... list.
Also, during painting, Component.setBackground() was being set.
This is very nonstandard and cannot be recommended.
I am surprised it works in Java.
Working now in JavaScript. Export to SVG and PNG are very nice!
hansonr [Thu, 16 May 2019 18:32:18 +0000 (13:32 -0500)]
Jalview-JS/JAL-3253-applet JAL-3267 URLConnection POST option broken in
SwingJS
hansonr [Thu, 16 May 2019 16:00:25 +0000 (11:00 -0500)]
Jalview-JS/JAL-3253-applet SwingJS upgrade for case-insensitive Applet
parameters
hansonr [Thu, 16 May 2019 15:59:35 +0000 (10:59 -0500)]
Jalview-JS/JAL-3253 applet param PDBFILE
hansonr [Thu, 16 May 2019 15:58:25 +0000 (10:58 -0500)]
Jalview-JS/JAL-3253 allow for dialog-free StructureViewer launch
hansonr [Thu, 16 May 2019 15:57:34 +0000 (10:57 -0500)]
Jalview-JS/JAL-3253 honor Applet param case insensitive
hansonr [Thu, 16 May 2019 15:56:32 +0000 (10:56 -0500)]
Jalview-JS/JAL-3253 applet param GROUPS
hansonr [Thu, 16 May 2019 05:17:03 +0000 (00:17 -0500)]
Jalview-JS/JAL-3253 applet params jpredfile, jnetfile
debug comments out, fixes for missing annotation file post-load tasks
hansonr [Thu, 16 May 2019 05:11:56 +0000 (00:11 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Thu, 16 May 2019 03:07:08 +0000 (22:07 -0500)]
Jalview-JS/JAL-3253 debug comments out
hansonr [Thu, 16 May 2019 03:07:08 +0000 (22:07 -0500)]
Jalview-JS/JAL-3253 AppletParams color params
"defaultcolour" -> "DEFAULT_COLOUR"
"defaultcolournuc" -> "DEFAULT_COLOUR_NUC"
"defaultcolourprot" -> "DEFAULT_COLOUR_PROT"
hansonr [Thu, 16 May 2019 01:17:42 +0000 (20:17 -0500)]
Jalview-JS/JAL-3253, JAL-3266 Varna preliminary upgrade
hansonr [Wed, 15 May 2019 23:29:53 +0000 (18:29 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Wed, 15 May 2019 23:27:06 +0000 (18:27 -0500)]
JAL-3253-applet,JAL-3263 SwingJS-site.zip clean build for 秘foo
hansonr [Wed, 15 May 2019 23:27:06 +0000 (18:27 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Wed, 15 May 2019 23:26:47 +0000 (18:26 -0500)]
JAL-3253-applet Platform getDocumentBase() and getCodeBase() as if
applet fixed
uses g.秘html5Applet instead of J2S.thisApplet
gmungoc [Wed, 15 May 2019 16:01:43 +0000 (17:01 +0100)]
JAL-3253-applet feature parameter processing fixed
gmungoc [Wed, 15 May 2019 16:01:43 +0000 (17:01 +0100)]
JAL-3253 ApplicationSingletonProvider replaces Instance
hansonr [Wed, 15 May 2019 14:53:39 +0000 (09:53 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Wed, 15 May 2019 14:52:42 +0000 (09:52 -0500)]
JAL-3253-applet, reading applet tag parameters needed toLowerCase()
hansonr [Wed, 15 May 2019 14:51:22 +0000 (09:51 -0500)]
JAL-3253-applet, JAL-3263 new SwingJS-site.zip for "_"
gmungoc [Wed, 15 May 2019 10:51:28 +0000 (11:51 +0100)]
JAL-3263 variable name now 秘html5Applet
hansonr [Tue, 14 May 2019 21:47:14 +0000 (16:47 -0500)]
Fix to not create lasting static instance in JavaScript; trims up code
hansonr [Tue, 14 May 2019 02:19:32 +0000 (21:19 -0500)]
removes temporary debugging line
hansonr [Tue, 14 May 2019 02:07:39 +0000 (21:07 -0500)]
JAL-3263, JAL 3264 New Transpiler fixes FunctionalInterface issues,
_xxxx issues,
privatizes SwingJS-private fields with Mandarin first "secret" character
\u79D8 (only affects File._byte; left here in both forms _byte and
秘byte
SwingJS bug in transpiler caused java.util.stream.MatchOps to fail. Adds
back in the IntervalStore classes into srcjar, which use Java8
FunctionalInterfaces.
hansonr [Mon, 13 May 2019 02:26:58 +0000 (21:26 -0500)]
Site resources for running pages with swingjs/JalviewJS.js
JalviewJS.js just a very thin implementation, enough to show a "Start
Jalview" button, read the <applet> tag for parameters, and to start the
applet when that button is pressed.
Using the applet tags allows support for both Java and JavaScript for
pages that have Jalview <applet> tags. (Java right now requires
?_USE=JAVA)
Info.resourcePath is used by jalview.bin.AppletParams to ensure that the
directory with the resources is found.
applets.html is functioning in a preliminary demo mode
- <applet> tag read successfully
- Info.resourcePath read successfully
- Info and applet parameters transferred successfully
- .fa and features files read successfully
- embedding and floating frames supported
- initial "Start Jalview" buttons working
- when VARNA 2D or other window is displays, others hide.
(probably because Desktop is in the DOM but hidden).
hansonr [Mon, 13 May 2019 02:17:12 +0000 (21:17 -0500)]
JalviewAppLoader for moving code from JalviewLite relating to applet
parameters
hansonr [Mon, 13 May 2019 02:15:37 +0000 (21:15 -0500)]
better preferences/properties
hansonr [Mon, 13 May 2019 02:14:04 +0000 (21:14 -0500)]
jalview.bin.AppletParams
hansonr [Mon, 13 May 2019 02:12:51 +0000 (21:12 -0500)]
new SwingJS-site.zip
hansonr [Mon, 13 May 2019 02:11:42 +0000 (21:11 -0500)]
VARNA fix for use of _border used by JSComponent (how to avoid this?)
hansonr [Fri, 10 May 2019 20:30:47 +0000 (15:30 -0500)]
trying to force a build at builds.jalview.org
hansonr [Fri, 10 May 2019 18:27:22 +0000 (13:27 -0500)]
minor edits
hansonr [Fri, 10 May 2019 18:24:32 +0000 (13:24 -0500)]
JAL-3253 FileFormats static removal
hansonr [Fri, 10 May 2019 18:18:12 +0000 (13:18 -0500)]
JAL-3253 jalview.bin.Instance for AppCache and FeatureAttribute
hansonr [Fri, 10 May 2019 18:00:33 +0000 (13:00 -0500)]
JAL-3253 jalview.bin.Instance streamlining
hansonr [Fri, 10 May 2019 12:03:42 +0000 (07:03 -0500)]
JAL-3253 jalview.bin.Instance handles all singleton instances -
preliminary
hansonr [Fri, 10 May 2019 02:53:36 +0000 (21:53 -0500)]
insignificant test file changes
hansonr [Fri, 10 May 2019 02:51:19 +0000 (21:51 -0500)]
Jalview-JS/JAL-3253-applet Desktop fix for null desktopPane in testing
hansonr [Thu, 9 May 2019 19:10:47 +0000 (14:10 -0500)]
Jalview-JS/JAL-3253-applet does not recognize \r\n as OK
hansonr [Thu, 9 May 2019 19:05:58 +0000 (14:05 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Thu, 9 May 2019 18:54:03 +0000 (13:54 -0500)]
Jalview-JS/JAL-3253-applet
hansonr [Thu, 9 May 2019 18:54:03 +0000 (13:54 -0500)]
Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet
hansonr [Thu, 9 May 2019 18:24:30 +0000 (13:24 -0500)]
JAL-3253/JAL-3258 FileLoader fix for use of file.separator
hansonr [Thu, 9 May 2019 18:24:30 +0000 (13:24 -0500)]
JAL-3253/JAL-3257
working on getting TestNG working with singletons
check for null property file in Cache.setProperty to avoid error message
in testng; fixes problems with FeatureFileTest and FeatureFile with
mixed or unconsidered line endings
hansonr [Thu, 9 May 2019 13:32:00 +0000 (08:32 -0500)]
JAL-3253 preliminary static fixes for JavaScript part 4 of 3
working on getting TestNG working with singletons
hansonr [Thu, 9 May 2019 03:35:47 +0000 (22:35 -0500)]
JAL-3253 preliminary static fixes for JavaScript part 3 of 3
More succinct singleton class instances stored in jalview.bin.Jalview.
All 2200 instances of "static" checked.
hansonr [Wed, 8 May 2019 21:42:23 +0000 (16:42 -0500)]
JAL-3253 preliminary static fixes for JavaScript part 2
Includes lazy dynamic loading of SequenceFetcher database options.
Note that if WebServices menu is enabled (Java, not JavaScript), then
all web-based database proxies are instantiated anyway.
hansonr [Wed, 8 May 2019 11:29:37 +0000 (06:29 -0500)]
JAL-3253 preliminary static fixes for JavaScript
Desktop.instance and Desktop.getInstance()
Jalview.instance and Jalview.getInstance()
AlignmentSorter.instance and AlignmentSorter.getInstance()
ArgsParser static final options
*SoapBindingStub static final _operations
Clean up of headless business
Clean up of ArgsParser options
hansonr [Wed, 8 May 2019 02:42:57 +0000 (21:42 -0500)]
JAL-3253 AppletParams class for processing applet-specific params
gmungoc [Fri, 26 Apr 2019 09:20:31 +0000 (10:20 +0100)]
JAL-3226 removal of superseded changes
gmungoc [Fri, 26 Apr 2019 09:17:09 +0000 (10:17 +0100)]
JAL-3010 borderless 'x' for "delete this filter condition"
hansonr [Tue, 23 Apr 2019 03:48:49 +0000 (22:48 -0500)]
[JAL-3226] problem that JavaScript (or Java) may consolidate multiple
repaint() requests in unpredictable ways. In this case, the issue was
that in response to a CTRL-C/CTRL-V paste request, in Java a fast
repaint request preceded two full requests, thus resulting
in a full request for paint. In constrast, in JavaScript, the three
requests were bundled together into one, so the fastPaint flag was
still present for the second and third request.
This resulted in incomplete painting.
The solution was to set seqCanvas.fastPaint and idCanvas.fastPaint false
in PaintRefresher when the target to be painted is one of those two
components.
BH 2019.04.22
hansonr [Mon, 22 Apr 2019 17:10:09 +0000 (12:10 -0500)]
update of SwingJS -- no changes known.
hansonr [Thu, 18 Apr 2019 18:15:55 +0000 (13:15 -0500)]
minor code clean up
hansonr [Thu, 18 Apr 2019 18:15:24 +0000 (13:15 -0500)]
minor code clean up
hansonr [Thu, 18 Apr 2019 17:59:40 +0000 (12:59 -0500)]
// BH 2018.04.18 comment: addNotify() is not appropriate here. We
// are not changing ancestors, and keyboard action listeners do
// not need to be reset. addNotify() is a very expensive operation,
// requiring a full re-layout of all parents and children.
// Note in JComponent:
// This method is called by the toolkit internally and should
// not be called directly by programs.
// I note that addNotify() is called in several areas of Jalview.
hansonr [Thu, 18 Apr 2019 17:55:55 +0000 (12:55 -0500)]
Adds check for gap padding to disallow fast paint upon pasting if
alignment has been modified.
hansonr [Thu, 18 Apr 2019 17:54:46 +0000 (12:54 -0500)]
removes unnecessary clearFastPaint
hansonr [Thu, 18 Apr 2019 17:54:08 +0000 (12:54 -0500)]
Corrects incorrect calls to ViewportRanges.setEndSeq()
This function has the limit of height - 1, not height. Also adds safety
for start < 0 in ViewportRanges.setEndSeq();
hansonr [Thu, 18 Apr 2019 15:03:30 +0000 (10:03 -0500)]
pushing again, just comments
hansonr [Thu, 18 Apr 2019 14:32:42 +0000 (09:32 -0500)]
hack for fastpaint Java bug upshifting one line after a sequence
selection paste. Covered in Java by a full paint by ConsensusThread.
hansonr [Thu, 18 Apr 2019 11:53:00 +0000 (06:53 -0500)]
reverting seqPanel.seqCanvas.clearFastPaint();
gmungoc [Thu, 18 Apr 2019 08:36:57 +0000 (09:36 +0100)]
Merge branch 'develop' into Jalview-JS/develop
gmungoc [Thu, 18 Apr 2019 08:36:28 +0000 (09:36 +0100)]
JAL-3193 dbSource always "ENSEMBL"
gmungoc [Thu, 18 Apr 2019 08:31:17 +0000 (09:31 +0100)]
Merge branch 'develop' into Jalview-JS/develop
hansonr [Thu, 18 Apr 2019 03:54:33 +0000 (22:54 -0500)]
explicit Hashtable objects
hansonr [Thu, 18 Apr 2019 03:53:59 +0000 (22:53 -0500)]
adds an explicit clearing of the SeqCanvas fastPaint flag upon viewport
adjustment
gmungoc [Wed, 17 Apr 2019 15:34:58 +0000 (16:34 +0100)]
JAL-3026 fix bug loading Jalview Project (in Java)
Jim Procter [Wed, 17 Apr 2019 14:34:59 +0000 (15:34 +0100)]
JAL-3111 fix 2.11 html anchor in docs
Jim Procter [Wed, 17 Apr 2019 14:32:58 +0000 (15:32 +0100)]
Merge branch 'documentation/JAL-3111_release_211' into develop
Jim Procter [Wed, 17 Apr 2019 14:32:36 +0000 (15:32 +0100)]
JAL-3111 Jalview 2.11 what’s New and estimated release date
Jim Procter [Wed, 17 Apr 2019 14:32:07 +0000 (15:32 +0100)]
JAL-3111 tweak PCA documentation