gmungoc [Tue, 18 Dec 2018 18:06:41 +0000 (18:06 +0000)]
JAL-3048 fix NPE in file chooser callbacks map
gmungoc [Tue, 18 Dec 2018 17:58:39 +0000 (17:58 +0000)]
Merge branch 'JAL-3048dialogRunner2' into Jalview-BH/JAL-3026-JAL-3063-JAXB
gmungoc [Tue, 18 Dec 2018 17:58:12 +0000 (17:58 +0000)]
JAL-3032 revert table repaint customisations
gmungoc [Tue, 18 Dec 2018 17:11:33 +0000 (17:11 +0000)]
JAL-3048 DialogRunnerI reduced to minimal implementation
hansonr [Tue, 18 Dec 2018 14:32:23 +0000 (08:32 -0600)]
removing special needs for JavaScript table repainting
gmungoc [Tue, 18 Dec 2018 12:31:57 +0000 (12:31 +0000)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2
Conflicts:
test/jalview/util/dialogrunner/DialogRunnerTest.java
hansonr [Tue, 18 Dec 2018 05:16:22 +0000 (23:16 -0600)]
opening/closing windows closes all menus
hansonr [Tue, 18 Dec 2018 04:37:13 +0000 (22:37 -0600)]
table work
- fixed use of save/restore of ui nodes in tables
- default background white
- inadvertent resetting of table background via JPopupMenu
hansonr [Tue, 18 Dec 2018 00:02:58 +0000 (18:02 -0600)]
extraneous "Score >" on left of page removed
hansonr [Tue, 18 Dec 2018 00:02:58 +0000 (18:02 -0600)]
extraneous "Score >" on left of page removed
hansonr [Mon, 17 Dec 2018 22:44:18 +0000 (16:44 -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
hansonr [Mon, 17 Dec 2018 22:43:57 +0000 (16:43 -0600)]
fixes JTabbedPane missing labels; color chooser e.g.
gmungoc [Mon, 17 Dec 2018 17:28:28 +0000 (17:28 +0000)]
JAL-3048 updated test class (not on classpath!) for code changes
gmungoc [Mon, 17 Dec 2018 17:25:49 +0000 (17:25 +0000)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2
Conflicts:
src/jalview/io/JalviewFileChooser.java
gmungoc [Mon, 17 Dec 2018 16:45:11 +0000 (16:45 +0000)]
Merge branch 'feature/JAL-3169cancelOverwrite' into trialMerge
Conflicts:
src/jalview/io/JalviewFileChooser.java
gmungoc [Mon, 17 Dec 2018 16:23:13 +0000 (16:23 +0000)]
JAL-3068 tidy status bar messaging
gmungoc [Mon, 17 Dec 2018 14:20:27 +0000 (14:20 +0000)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
JAL-3048dialogRunner2
Conflicts:
src/jalview/io/JalviewFileChooser.java
hansonr [Sun, 16 Dec 2018 19:47:31 +0000 (13:47 -0600)]
Java2Script/SwingJS 3.2.4.05
- fixes FeatureIcon painting
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
gmungoc [Tue, 11 Dec 2018 08:34:41 +0000 (08:34 +0000)]
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into JAL-3048dialogRunner2
gmungoc [Mon, 10 Dec 2018 15:29:08 +0000 (15:29 +0000)]
JAL-3048 wip externalise trigger from RunResponse
gmungoc [Mon, 10 Dec 2018 13:55:12 +0000 (13:55 +0000)]
Merge branch 'feature/JAL-3169cancelOverwrite' into
JAL-3048dialogRunner2
Conflicts:
src/jalview/io/JalviewFileChooser.java
gmungoc [Mon, 10 Dec 2018 12:09:43 +0000 (12:09 +0000)]
JAL-1421 added type to List and Vector
gmungoc [Mon, 10 Dec 2018 11:25:44 +0000 (11:25 +0000)]
JAL-3169 leave file browser open on Cancel in overwrite check
gmungoc [Mon, 10 Dec 2018 10:20:15 +0000 (10:20 +0000)]
JAL-3048 DialogRunner changes (wip)
gmungoc [Mon, 10 Dec 2018 10:19:42 +0000 (10:19 +0000)]
JAL-1544 corrected 'adjunst' to 'adjust'
hansonr [Mon, 10 Dec 2018 07:49:03 +0000 (01:49 -0600)]
Faster JTable processing; fixes Annotation painting issues (?)
gmungoc [Thu, 6 Dec 2018 15:02:15 +0000 (15:02 +0000)]
JAL-3048 response() renamed addResponse(); checkstyle warning fixes
gmungoc [Thu, 6 Dec 2018 14:54:30 +0000 (14:54 +0000)]
JAL-3048 explicit instead of default 'No' response handler
gmungoc [Thu, 6 Dec 2018 13:26:46 +0000 (13:26 +0000)]
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
gmungoc [Thu, 6 Dec 2018 10:06:25 +0000 (10:06 +0000)]
JAL-1854 fix Checkstyle import violations
gmungoc [Thu, 6 Dec 2018 10:05:57 +0000 (10:05 +0000)]
JAL-1854 Checkstyle updated to 8.12
gmungoc [Tue, 4 Dec 2018 13:22:55 +0000 (13:22 +0000)]
JAL-3032 set radio buttons transparent
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.)
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);
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
gmungoc [Mon, 3 Dec 2018 11:30:09 +0000 (11:30 +0000)]
JAL-3168 include feature type in colour chooser dialog title
gmungoc [Mon, 3 Dec 2018 10:41:37 +0000 (10:41 +0000)]
JAL-3167 end cell editing on cancel in colour chooser
gmungoc [Mon, 3 Dec 2018 10:37:35 +0000 (10:37 +0000)]
JAL-3058 provide cancel callback method for colour chooser
hansonr [Sat, 1 Dec 2018 11:44:39 +0000 (05:44 -0600)]
adding jaxbtest.jvx and directing JalviewJS2.java to open it.
gmungoc [Tue, 27 Nov 2018 16:21:06 +0000 (16:21 +0000)]
JAL-3163 only log missing message keys once each
gmungoc [Mon, 26 Nov 2018 16:24:32 +0000 (16:24 +0000)]
JAL-3162 only allow start <= end while modifying
hansonr [Mon, 26 Nov 2018 12:29:29 +0000 (06:29 -0600)]
jsSlider null issue (was missing "this.")
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
hansonr [Mon, 26 Nov 2018 12:19:19 +0000 (06:19 -0600)]
missing submenu fix
gmungoc [Mon, 26 Nov 2018 10:44:56 +0000 (10:44 +0000)]
JAL-3032 make JS properties conditional on Jalview.isJS()
hansonr [Mon, 26 Nov 2018 05:37:38 +0000 (23:37 -0600)]
fixes sluggish frame moves -- no need to repaint JInternalFrame
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.
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
hansonr [Mon, 26 Nov 2018 02:36:25 +0000 (20:36 -0600)]
adds swingjs.overflow.hidden client property
see Desktop.java
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.
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
hansonr [Thu, 22 Nov 2018 01:02:08 +0000 (19:02 -0600)]
#104 JTextArea not wrapping.
hansonr [Thu, 22 Nov 2018 00:17:48 +0000 (18:17 -0600)]
#97 JLabel, JPanel LineBorder missing;
just needed removal of a Graphics2D check.
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
hansonr [Wed, 21 Nov 2018 19:20:00 +0000 (13:20 -0600)]
graphics antialias fix, one more try at getting files right for
scrollbar
hansonr [Wed, 21 Nov 2018 18:36:00 +0000 (12:36 -0600)]
fixes popup menu add/remove; fixes unicode triangle
hansonr [Wed, 21 Nov 2018 04:50:12 +0000 (22:50 -0600)]
final menu work
hansonr [Wed, 21 Nov 2018 04:21:20 +0000 (22:21 -0600)]
fixes for menus and scrollbars
hansonr [Wed, 21 Nov 2018 04:21:20 +0000 (22:21 -0600)]
fixes for menus and scrollbars
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.
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
hansonr [Tue, 20 Nov 2018 05:00:12 +0000 (23:00 -0600)]
should fix issue with hover-activated scrollbar
gmungoc [Mon, 19 Nov 2018 15:14:34 +0000 (15:14 +0000)]
JAL-3032 J2S variant for painting JTable
gmungoc [Mon, 19 Nov 2018 15:13:19 +0000 (15:13 +0000)]
JAL-3032 reinstate methods now available in SwingJS
hansonr [Sun, 18 Nov 2018 06:57:30 +0000 (00:57 -0600)]
JAL-3026-JAL-3063 fix for JTable row/col dragging
hansonr [Sun, 18 Nov 2018 06:56:58 +0000 (00:56 -0600)]
adds JS hook for JTable repaint
hansonr [Sun, 18 Nov 2018 06:02:15 +0000 (00:02 -0600)]
BH - suggestion to turn off column dragging in Java (and JavaScript)
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
hansonr [Sun, 18 Nov 2018 00:37:39 +0000 (18:37 -0600)]
JAL-3026-JAL-3063 #98, #141
hansonr [Sat, 17 Nov 2018 21:00:38 +0000 (15:00 -0600)]
JAL-3026-JAL-3063 Menu font line spacing fix
hansonr [Sat, 17 Nov 2018 20:37:50 +0000 (14:37 -0600)]
JAL-3026-JAL-3063 menu fonts
hansonr [Sat, 17 Nov 2018 19:37:54 +0000 (13:37 -0600)]
SwingJS-site.zip for menus JAL-3026
hansonr [Sat, 17 Nov 2018 19:24:07 +0000 (13:24 -0600)]
JAL-3026-JAL-3063 menus dyanamic; better alignment
hansonr [Fri, 16 Nov 2018 09:16:37 +0000 (03:16 -0600)]
JAL-3026-JAL-3063 fix for panel layout failure
SwingJS-site.zip
gmungoc [Fri, 16 Nov 2018 08:04:54 +0000 (08:04 +0000)]
JAL-2069 wider dialog so all fields show!
hansonr [Fri, 16 Nov 2018 00:19:07 +0000 (18:19 -0600)]
fixing several GD# -- see green colors
hansonr [Thu, 15 Nov 2018 18:54:02 +0000 (12:54 -0600)]
Jmol/SwingJS-site update for handling communally cached files
gmungoc [Thu, 15 Nov 2018 14:04:08 +0000 (14:04 +0000)]
JAL-3063 remove commented code, suppress debug output
gmungoc [Thu, 15 Nov 2018 14:02:52 +0000 (14:02 +0000)]
JAL-2344 unit test updated for code change
gmungoc [Thu, 15 Nov 2018 13:59:34 +0000 (13:59 +0000)]
JAL-3032 JAL-2344 project files are 'identifiable'
hansonr [Thu, 15 Nov 2018 12:57:13 +0000 (06:57 -0600)]
JAL-3026-JAL-3063 aliases JSFrame/JSDialog as Frame/Dialog
hansonr [Thu, 15 Nov 2018 04:38:08 +0000 (22:38 -0600)]
JMenu selected/deselected events implemented
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
gmungoc [Wed, 14 Nov 2018 15:18:23 +0000 (15:18 +0000)]
JAL-3152 holding patch for colour Jmol by sequence
hansonr [Wed, 14 Nov 2018 13:50:08 +0000 (07:50 -0600)]
JAL-3026-JAL-3063 fixes title-bar overflow
hansonr [Tue, 13 Nov 2018 22:57:02 +0000 (16:57 -0600)]
new jmol-app.zip fixes unnecessary Exception calling in COLOR cmd
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
hansonr [Tue, 13 Nov 2018 20:32:21 +0000 (14:32 -0600)]
JAL-3026-JAL-3063 fixes tooltip persistence problem GD#148
gmungoc [Tue, 13 Nov 2018 19:08:32 +0000 (19:08 +0000)]
JAL-3026 add equals() to test
gmungoc [Tue, 13 Nov 2018 18:49:17 +0000 (18:49 +0000)]
JAL-3026 tweak to test class
gmungoc [Tue, 13 Nov 2018 17:52:42 +0000 (17:52 +0000)]
JAL-3026 test for File.hashCode problem
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
gmungoc [Mon, 12 Nov 2018 17:43:59 +0000 (17:43 +0000)]
JAL-3076 JalviewJS requires lower case content-type parameter in URL
hansonr [Mon, 12 Nov 2018 10:44:03 +0000 (04:44 -0600)]
0-length SwingJS-site
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.
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
hansonr [Sun, 11 Nov 2018 20:36:41 +0000 (14:36 -0600)]
Fixes for JInternalFrame, JAXB, String
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
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
git://source.jalview.org / jalview.git / log