jalview.git
5 years agofixes JTabbedPane missing labels; color chooser e.g.
hansonr [Mon, 17 Dec 2018 22:43:57 +0000 (16:43 -0600)]
fixes JTabbedPane missing labels; color chooser e.g.

5 years agoJava2Script/SwingJS 3.2.4.05
hansonr [Sun, 16 Dec 2018 19:47:31 +0000 (13:47 -0600)]
Java2Script/SwingJS 3.2.4.05

- fixes FeatureIcon painting

5 years agoSwingJS 3.2.4.05 should fix JFileChooser synthetic ref issue
hansonr [Thu, 13 Dec 2018 23:03:46 +0000 (17:03 -0600)]
SwingJS 3.2.4.05 should fix JFileChooser synthetic ref issue

adds better detection of HTTP_FILE_NOT_FOUND error if using jsmol.php
relay (which seems to always add \r\n and gives status 200, even if the
actual response was 404

5 years agoFaster JTable processing; fixes Annotation painting issues (?)
hansonr [Mon, 10 Dec 2018 07:49:03 +0000 (01:49 -0600)]
Faster JTable processing; fixes Annotation painting issues (?)

5 years agoJAL-3048 response() renamed addResponse(); checkstyle warning fixes
gmungoc [Thu, 6 Dec 2018 15:02:15 +0000 (15:02 +0000)]
JAL-3048 response() renamed addResponse(); checkstyle warning fixes

5 years agoJAL-3048 explicit instead of default 'No' response handler
gmungoc [Thu, 6 Dec 2018 14:54:30 +0000 (14:54 +0000)]
JAL-3048 explicit instead of default 'No' response handler

5 years agoMerge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
gmungoc [Thu, 6 Dec 2018 13:26:46 +0000 (13:26 +0000)]
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB

5 years agoJAL-1854 fix Checkstyle import violations
gmungoc [Thu, 6 Dec 2018 10:06:25 +0000 (10:06 +0000)]
JAL-1854 fix Checkstyle import violations

5 years agoJAL-1854 Checkstyle updated to 8.12
gmungoc [Thu, 6 Dec 2018 10:05:57 +0000 (10:05 +0000)]
JAL-1854 Checkstyle updated to 8.12

5 years agoJAL-3032 set radio buttons transparent
gmungoc [Tue, 4 Dec 2018 13:22:55 +0000 (13:22 +0000)]
JAL-3032 set radio buttons transparent

5 years agoSwingJS upgrade -- tables smoother, faster; more to do?
hansonr [Tue, 4 Dec 2018 08:31:45 +0000 (02:31 -0600)]
SwingJS upgrade -- tables smoother, faster; more to do?

Still a problem with FeatureTypeSettings not responding to color chooser
OK properly. (Color is not setting.)

5 years agox,y switch in FeatureIcon
hansonr [Tue, 4 Dec 2018 01:18:28 +0000 (19:18 -0600)]
x,y switch in FeatureIcon

//      g.fillRect(0, e1, width - e1, height);  // BH 2018
      g.fillRect(e1, 0, width - e1, height);

5 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Mon, 3 Dec 2018 17:11:31 +0000 (11:11 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

5 years agoJAL-3168 include feature type in colour chooser dialog title
gmungoc [Mon, 3 Dec 2018 11:30:09 +0000 (11:30 +0000)]
JAL-3168 include feature type in colour chooser dialog title

5 years agoJAL-3167 end cell editing on cancel in colour chooser
gmungoc [Mon, 3 Dec 2018 10:41:37 +0000 (10:41 +0000)]
JAL-3167 end cell editing on cancel in colour chooser

5 years agoJAL-3058 provide cancel callback method for colour chooser
gmungoc [Mon, 3 Dec 2018 10:37:35 +0000 (10:37 +0000)]
JAL-3058 provide cancel callback method for colour chooser

5 years agoadding jaxbtest.jvx and directing JalviewJS2.java to open it.
hansonr [Sat, 1 Dec 2018 11:44:39 +0000 (05:44 -0600)]
adding jaxbtest.jvx and directing JalviewJS2.java to open it.

5 years agoJAL-3163 only log missing message keys once each
gmungoc [Tue, 27 Nov 2018 16:21:06 +0000 (16:21 +0000)]
JAL-3163 only log missing message keys once each

5 years agoJAL-3162 only allow start <= end while modifying bug/JAL-3162featureStartLtEnd
gmungoc [Mon, 26 Nov 2018 16:24:32 +0000 (16:24 +0000)]
JAL-3162 only allow start <= end while modifying

5 years agojsSlider null issue (was missing "this.")
hansonr [Mon, 26 Nov 2018 12:29:29 +0000 (06:29 -0600)]
jsSlider null issue (was missing "this.")

5 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Mon, 26 Nov 2018 12:19:52 +0000 (06:19 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

5 years agomissing submenu fix
hansonr [Mon, 26 Nov 2018 12:19:19 +0000 (06:19 -0600)]
missing submenu fix

5 years agoJAL-3032 make JS properties conditional on Jalview.isJS()
gmungoc [Mon, 26 Nov 2018 10:44:56 +0000 (10:44 +0000)]
JAL-3032 make JS properties conditional on Jalview.isJS()

5 years agofixes sluggish frame moves -- no need to repaint JInternalFrame
hansonr [Mon, 26 Nov 2018 05:37:38 +0000 (23:37 -0600)]
fixes sluggish frame moves -- no need to repaint JInternalFrame

5 years agoJSlider/JScrollbar issues resolved (preliminary)
hansonr [Mon, 26 Nov 2018 04:30:02 +0000 (22:30 -0600)]
JSlider/JScrollbar issues resolved (preliminary)

- destroyed slider still being called. Possibly because it is still
somehow registered with jQuery. TODO

- note that frames are being redrawn when moved. This is unnecessary in
SwingJS.

5 years agoimplements swingjs
hansonr [Mon, 26 Nov 2018 02:39:18 +0000 (20:39 -0600)]
implements swingjs

JPanel, JRootPane, and JDesktopPane allow for

 putClientProperty("swingjs.overflow.hidden","false")

Setting getRootPane(), getContentPane(), and the desktop itself are all
necessary.

See jalview/gui/Desktop.java

5 years agoadds swingjs.overflow.hidden client property
hansonr [Mon, 26 Nov 2018 02:36:25 +0000 (20:36 -0600)]
adds swingjs.overflow.hidden client property

see Desktop.java

5 years agocursors for panels
hansonr [Sat, 24 Nov 2018 18:09:48 +0000 (12:09 -0600)]
cursors for panels

BH note to self: JSComponentUI was using ui.domNode instead of
ui.outerNode. For a panel this is an empty node inside the outerNode,
which is what holds all the children. So the cursor was being set, but
the children did not inherit it.

Also missing some cursor names; now set to draw cursor names from
JSToolkit. But note that JSToolkit.setCursor should not be called.

5 years agoColorChooser fix, JSlider fix, JMenuBar fix
hansonr [Sat, 24 Nov 2018 16:43:48 +0000 (10:43 -0600)]
ColorChooser fix, JSlider fix, JMenuBar fix

ColorChooser RGB panel sliders broken
JMenuBar needed to allow adding menu items before after fully created

6 years ago#104 JTextArea not wrapping.
hansonr [Thu, 22 Nov 2018 01:02:08 +0000 (19:02 -0600)]
#104 JTextArea not wrapping.

6 years ago#97 JLabel, JPanel LineBorder missing;
hansonr [Thu, 22 Nov 2018 00:17:48 +0000 (18:17 -0600)]
#97 JLabel, JPanel LineBorder missing;

just needed removal of a Graphics2D check.

6 years agoOK, several good fixes here.
hansonr [Wed, 21 Nov 2018 19:54:27 +0000 (13:54 -0600)]
OK, several good fixes here.
- AJAX caching using Java's URLConnection.setUseCache()  and
setDefaultUseCache() methods
- correct corrected jquery-ui-j2sscroller.js file (really!)
- popup menu add/replace (was just drop-down)
- antialiasing returned for graphics

6 years agographics antialias fix, one more try at getting files right for
hansonr [Wed, 21 Nov 2018 19:20:00 +0000 (13:20 -0600)]
graphics antialias fix, one more try at getting files right for
scrollbar

6 years agofixes popup menu add/remove; fixes unicode triangle
hansonr [Wed, 21 Nov 2018 18:36:00 +0000 (12:36 -0600)]
fixes popup menu add/remove; fixes unicode triangle

6 years agofinal menu work
hansonr [Wed, 21 Nov 2018 04:50:12 +0000 (22:50 -0600)]
final menu work

6 years agofixes for menus and scrollbars
hansonr [Wed, 21 Nov 2018 04:21:20 +0000 (22:21 -0600)]
fixes for menus and scrollbars

6 years agofixes for menus and scrollbars
hansonr [Wed, 21 Nov 2018 04:21:20 +0000 (22:21 -0600)]
fixes for menus and scrollbars

6 years agountested new SwingJS-site.zip so that at least we all have the same one.
hansonr [Tue, 20 Nov 2018 12:50:14 +0000 (06:50 -0600)]
untested new SwingJS-site.zip so that at least we all have the same one.

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Tue, 20 Nov 2018 05:00:58 +0000 (23:00 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoshould fix issue with hover-activated scrollbar
hansonr [Tue, 20 Nov 2018 05:00:12 +0000 (23:00 -0600)]
should fix issue with hover-activated scrollbar

6 years agoJAL-3032 J2S variant for painting JTable
gmungoc [Mon, 19 Nov 2018 15:14:34 +0000 (15:14 +0000)]
JAL-3032 J2S variant for painting JTable

6 years agoJAL-3032 reinstate methods now available in SwingJS
gmungoc [Mon, 19 Nov 2018 15:13:19 +0000 (15:13 +0000)]
JAL-3032 reinstate methods now available in SwingJS

6 years agoJAL-3026-JAL-3063 fix for JTable row/col dragging
hansonr [Sun, 18 Nov 2018 06:57:30 +0000 (00:57 -0600)]
JAL-3026-JAL-3063 fix for JTable row/col dragging

6 years agoadds JS hook for JTable repaint
hansonr [Sun, 18 Nov 2018 06:56:58 +0000 (00:56 -0600)]
adds JS hook for JTable repaint

6 years agoBH - suggestion to turn off column dragging in Java (and JavaScript)
hansonr [Sun, 18 Nov 2018 06:02:15 +0000 (00:02 -0600)]
BH - suggestion to turn off column dragging in Java (and JavaScript)

6 years agomisc fixes
hansonr [Sun, 18 Nov 2018 05:21:31 +0000 (23:21 -0600)]
misc fixes

adds move cursor for JSplitPane
corrects EventDispatchThread miscoding
adds dummy frame consideration for SwingUtilities.SharedOwnerFrame
sets mouse click for multiple click from jqevent.originalEvent
adds JSplitPane drag cursor on mouse move
fixes JComboBox not being disabled
fixes early setCursor before peer is created

6 years agoJAL-3026-JAL-3063 #98, #141
hansonr [Sun, 18 Nov 2018 00:37:39 +0000 (18:37 -0600)]
JAL-3026-JAL-3063  #98, #141

6 years agoJAL-3026-JAL-3063 Menu font line spacing fix
hansonr [Sat, 17 Nov 2018 21:00:38 +0000 (15:00 -0600)]
JAL-3026-JAL-3063 Menu font line spacing fix

6 years agoJAL-3026-JAL-3063 menu fonts
hansonr [Sat, 17 Nov 2018 20:37:50 +0000 (14:37 -0600)]
JAL-3026-JAL-3063  menu fonts

6 years agoSwingJS-site.zip for menus JAL-3026
hansonr [Sat, 17 Nov 2018 19:37:54 +0000 (13:37 -0600)]
SwingJS-site.zip for menus  JAL-3026

6 years agoJAL-3026-JAL-3063 menus dyanamic; better alignment
hansonr [Sat, 17 Nov 2018 19:24:07 +0000 (13:24 -0600)]
JAL-3026-JAL-3063 menus dyanamic; better alignment

6 years agoJAL-3026-JAL-3063 fix for panel layout failure
hansonr [Fri, 16 Nov 2018 09:16:37 +0000 (03:16 -0600)]
JAL-3026-JAL-3063 fix for panel layout failure

SwingJS-site.zip

6 years agoJAL-2069 wider dialog so all fields show!
gmungoc [Fri, 16 Nov 2018 08:04:54 +0000 (08:04 +0000)]
JAL-2069 wider dialog so all fields show!

6 years agofixing several GD# -- see green colors
hansonr [Fri, 16 Nov 2018 00:19:07 +0000 (18:19 -0600)]
fixing several GD# -- see green colors

6 years agoJmol/SwingJS-site update for handling communally cached files
hansonr [Thu, 15 Nov 2018 18:54:02 +0000 (12:54 -0600)]
Jmol/SwingJS-site update for handling communally cached files

6 years agoJAL-3063 remove commented code, suppress debug output
gmungoc [Thu, 15 Nov 2018 14:04:08 +0000 (14:04 +0000)]
JAL-3063 remove commented code, suppress debug output

6 years agoJAL-2344 unit test updated for code change
gmungoc [Thu, 15 Nov 2018 14:02:52 +0000 (14:02 +0000)]
JAL-2344 unit test updated for code change

6 years agoJAL-3032 JAL-2344 project files are 'identifiable'
gmungoc [Thu, 15 Nov 2018 13:59:34 +0000 (13:59 +0000)]
JAL-3032 JAL-2344 project files are 'identifiable'

6 years agoJAL-3026-JAL-3063 aliases JSFrame/JSDialog as Frame/Dialog
hansonr [Thu, 15 Nov 2018 12:57:13 +0000 (06:57 -0600)]
JAL-3026-JAL-3063 aliases JSFrame/JSDialog as Frame/Dialog

6 years agoJMenu selected/deselected events implemented
hansonr [Thu, 15 Nov 2018 04:38:08 +0000 (22:38 -0600)]
JMenu selected/deselected events implemented

6 years agoJAL-3032 don't throw Exception to signal chain not found, return null
gmungoc [Wed, 14 Nov 2018 16:34:09 +0000 (16:34 +0000)]
JAL-3032 don't throw Exception to signal chain not found, return null

6 years agoJAL-3152 holding patch for colour Jmol by sequence
gmungoc [Wed, 14 Nov 2018 15:18:23 +0000 (15:18 +0000)]
JAL-3152 holding patch for colour Jmol by sequence

6 years agoJAL-3026-JAL-3063 fixes title-bar overflow
hansonr [Wed, 14 Nov 2018 13:50:08 +0000 (07:50 -0600)]
JAL-3026-JAL-3063  fixes title-bar overflow

6 years agonew jmol-app.zip fixes unnecessary Exception calling in COLOR cmd
hansonr [Tue, 13 Nov 2018 22:57:02 +0000 (16:57 -0600)]
new jmol-app.zip fixes unnecessary Exception calling in COLOR cmd

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Tue, 13 Nov 2018 20:32:41 +0000 (14:32 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoJAL-3026-JAL-3063 fixes tooltip persistence problem GD#148
hansonr [Tue, 13 Nov 2018 20:32:21 +0000 (14:32 -0600)]
JAL-3026-JAL-3063 fixes tooltip persistence problem GD#148

6 years agoJAL-3026 add equals() to test
gmungoc [Tue, 13 Nov 2018 19:08:32 +0000 (19:08 +0000)]
JAL-3026 add equals() to test

6 years agoJAL-3026 tweak to test class
gmungoc [Tue, 13 Nov 2018 18:49:17 +0000 (18:49 +0000)]
JAL-3026 tweak to test class

6 years agoJAL-3026 test for File.hashCode problem
gmungoc [Tue, 13 Nov 2018 17:52:42 +0000 (17:52 +0000)]
JAL-3026 test for File.hashCode problem

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
gmungoc [Tue, 13 Nov 2018 08:19:37 +0000 (08:19 +0000)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoJAL-3076 JalviewJS requires lower case content-type parameter in URL
gmungoc [Mon, 12 Nov 2018 17:43:59 +0000 (17:43 +0000)]
JAL-3076 JalviewJS requires lower case content-type parameter in URL

6 years ago0-length SwingJS-site
hansonr [Mon, 12 Nov 2018 10:44:03 +0000 (04:44 -0600)]
0-length SwingJS-site

6 years agoJAL-3026-JAL-3063 removes antialiasing
hansonr [Mon, 12 Nov 2018 00:54:43 +0000 (18:54 -0600)]
JAL-3026-JAL-3063 removes antialiasing

trying to make lines thinner, but this is not the way, apparently.

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Sun, 11 Nov 2018 23:42:21 +0000 (17:42 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoFixes for JInternalFrame, JAXB, String
hansonr [Sun, 11 Nov 2018 20:36:41 +0000 (14:36 -0600)]
Fixes for JInternalFrame, JAXB, String

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Sun, 11 Nov 2018 20:36:41 +0000 (14:36 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
hansonr [Sun, 11 Nov 2018 20:35:27 +0000 (14:35 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
hansonr [Sun, 11 Nov 2018 20:35:27 +0000 (14:35 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp

6 years agoJAL-3026-JAL-3063 JTable and JSplitPane
hansonr [Sun, 11 Nov 2018 20:13:15 +0000 (14:13 -0600)]
JAL-3026-JAL-3063 JTable and JSplitPane

JTable performance improved; still rendering twice?

JSplitPane implemented.

JFrame and JInternalFrame jumping fixed.

6 years agoJAL-3026-JAL-3063 JTable and JSplitPane
hansonr [Sun, 11 Nov 2018 20:13:15 +0000 (14:13 -0600)]
JAL-3026-JAL-3063 JTable and JSplitPane

JTable performance improved; still rendering twice?

JSplitPane implmented.

6 years agobetter JTable performance, 1/2
hansonr [Sun, 11 Nov 2018 15:47:17 +0000 (09:47 -0600)]
better JTable performance, 1/2

6 years agopivot table summary of @Xml*
hansonr [Sun, 11 Nov 2018 10:26:45 +0000 (04:26 -0600)]
pivot table summary of @Xml*

6 years agoadds explicit AJAX-allowed
hansonr [Sun, 11 Nov 2018 10:26:10 +0000 (04:26 -0600)]
adds explicit AJAX-allowed

6 years agoJAL-3026-JAL-3063 transpiler and runtime update
hansonr [Sun, 11 Nov 2018 00:41:44 +0000 (18:41 -0600)]
JAL-3026-JAL-3063 transpiler and runtime update

Adds @XmlElements for UniProt and EMBL

Fixes missing border UIResource

Removes debugging messages in JTable and JAXB*

6 years agominor org.json JavaScript version update
hansonr [Sun, 11 Nov 2018 00:37:07 +0000 (18:37 -0600)]
minor org.json JavaScript version update

6 years agoadds static declaration of AJAX-readable domains
hansonr [Sun, 11 Nov 2018 00:35:59 +0000 (18:35 -0600)]
adds static declaration of AJAX-readable domains

6 years agoJAL-3026-JAL-3063 SwingJS-site.zip fix
hansonr [Fri, 9 Nov 2018 02:52:37 +0000 (20:52 -0600)]
JAL-3026-JAL-3063 SwingJS-site.zip fix

- JTable null cell value,
- JAXB fix for xmlns in uniprot

6 years agoJAL-1889 ignore Clover instrumentation in test (second attempt)
gmungoc [Thu, 8 Nov 2018 15:34:57 +0000 (15:34 +0000)]
JAL-1889 ignore Clover instrumentation in test (second attempt)

6 years agoJAL-1889 unit test tweaks for running on server
gmungoc [Thu, 8 Nov 2018 15:24:06 +0000 (15:24 +0000)]
JAL-1889 unit test tweaks for running on server

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Thu, 8 Nov 2018 13:28:13 +0000 (07:28 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoJAL-3116 better unmarshalling of EMBL/Uniprot XML
gmungoc [Thu, 8 Nov 2018 13:27:49 +0000 (13:27 +0000)]
JAL-3116 better unmarshalling of EMBL/Uniprot XML

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Thu, 8 Nov 2018 13:27:18 +0000 (07:27 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoremoved jalview test code truncated ObjectFactory
hansonr [Thu, 8 Nov 2018 13:26:20 +0000 (07:26 -0600)]
removed jalview test code truncated ObjectFactory

6 years agoJAL-3048 use JalviewJS compatible JalviewFileChooser.showOpenDialog
gmungoc [Thu, 8 Nov 2018 11:04:20 +0000 (11:04 +0000)]
JAL-3048 use JalviewJS compatible JalviewFileChooser.showOpenDialog

6 years agoJAL-3048 override showOpenDialog with JalviewJS compatible code
gmungoc [Thu, 8 Nov 2018 11:00:00 +0000 (11:00 +0000)]
JAL-3048 override showOpenDialog with JalviewJS compatible code

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
hansonr [Wed, 7 Nov 2018 18:03:26 +0000 (12:03 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026-JAL-3063-JAXB

6 years agoJAL-3026-JAL-3063 JAXB unmarshaller fix
hansonr [Wed, 7 Nov 2018 13:40:57 +0000 (07:40 -0600)]
JAL-3026-JAL-3063 JAXB unmarshaller fix

6 years agoJAL-3026-JAL-3063 session test files
hansonr [Wed, 7 Nov 2018 13:40:57 +0000 (07:40 -0600)]
JAL-3026-JAL-3063 session test files

JS loads java50.jvx, but not java50b.jvx.

6 years agoJAL-3026-JAL-3063-JAXB marshalling
hansonr [Wed, 7 Nov 2018 04:23:56 +0000 (22:23 -0600)]
JAL-3026-JAL-3063-JAXB marshalling

JAXB marshalling/unmarshalling successful
JavaScript marshal -> Java unmarshal
JavaScript marshal -> JavaScript unmarshal
Java marshal -> JavaScript unmarshal

6 years agoMerge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
hansonr [Tue, 6 Nov 2018 01:38:12 +0000 (19:38 -0600)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp