Jim Procter [Fri, 29 Jun 2018 15:18:27 +0000 (16:18 +0100)]
JAL-3048 jalview.utils.dialogrunner.DialogRunner allows sequences of runnable methods to be sequentially triggered according to response codes from a dialog.
hansonr [Thu, 28 Jun 2018 16:19:23 +0000 (17:19 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Thu, 28 Jun 2018 16:17:38 +0000 (17:17 +0100)]
JAL-3032 JvOptionPane summary of issues with boilerplate modal dialogs.
90 cases no issue; 5 works.
Jim Procter [Thu, 28 Jun 2018 16:15:04 +0000 (17:15 +0100)]
Merge branch 'Jalview-BH/JAL-3048_dialogs' into Jalview-BH/JAL-3026
Jim Procter [Thu, 28 Jun 2018 15:53:36 +0000 (16:53 +0100)]
JAL-3026 JAL-1551 formatting
Jim Procter [Thu, 28 Jun 2018 15:52:56 +0000 (16:52 +0100)]
JAL-3048 TODOs for refactoring JalviewFileChooser pattern
JAL-3026 disable browser select dialog for default browser in javasript
Jim Procter [Thu, 28 Jun 2018 15:51:32 +0000 (16:51 +0100)]
JAL-3048 TODOs for refactoring JalviewFileChooser pattern
gmungoc [Thu, 28 Jun 2018 15:49:10 +0000 (16:49 +0100)]
JAL-3032 avoid use of lambda expression or BasicArrowButton
Jim Procter [Thu, 28 Jun 2018 15:48:06 +0000 (16:48 +0100)]
JAL-3048 todo and JAL-3026 disable VCF support
hansonr [Thu, 28 Jun 2018 13:54:21 +0000 (14:54 +0100)]
JAL-3032 SwingJS-site.zip for wrong case in filename in site/
hansonr [Thu, 28 Jun 2018 13:45:16 +0000 (14:45 +0100)]
FileAsBytes
hansonr [Thu, 28 Jun 2018 13:30:54 +0000 (14:30 +0100)]
Dialogs JAL-3032
hansonr [Thu, 28 Jun 2018 13:20:11 +0000 (14:20 +0100)]
JAL-3032 FileChooser missing correct call to JSToolkit.getFileAsBytes$
hansonr [Thu, 28 Jun 2018 07:08:42 +0000 (08:08 +0100)]
JAL-3032 GD#46 menu buttons not fully disabling
hansonr [Thu, 28 Jun 2018 06:44:22 +0000 (07:44 +0100)]
JAL-3032 fix for Array.sort
hansonr [Thu, 28 Jun 2018 05:06:49 +0000 (06:06 +0100)]
JAL-3032 GD#70 internalFrameClosed event not fired
hansonr [Thu, 28 Jun 2018 02:00:44 +0000 (03:00 +0100)]
JAL-3032 DND enabled; additional io changes for File vs. String
hansonr [Wed, 27 Jun 2018 17:33:09 +0000 (18:33 +0100)]
JAL-3032 support for JDesktop Drag and Drop
hansonr [Wed, 27 Jun 2018 14:09:25 +0000 (15:09 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Wed, 27 Jun 2018 14:08:33 +0000 (15:08 +0100)]
transpiler fix for arr[Integer]
gmungoc [Wed, 27 Jun 2018 14:05:02 +0000 (15:05 +0100)]
JAL-3032 explicit Integer.intValue() conversion for safety
hansonr [Wed, 27 Jun 2018 12:02:24 +0000 (13:02 +0100)]
JAL-3026 FileParser for JFileChooser results as ByteArrayInputStream;
does not imply text.
hansonr [Wed, 27 Jun 2018 10:26:01 +0000 (11:26 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Wed, 27 Jun 2018 10:25:33 +0000 (11:25 +0100)]
JAL-3032 just the changes pulled already
hansonr [Wed, 27 Jun 2018 10:24:43 +0000 (11:24 +0100)]
JAL-3032 Dialogs Color picker -- untested commit
hansonr [Wed, 27 Jun 2018 10:23:42 +0000 (11:23 +0100)]
JAL-3032 comments only - starting work on dialogs
hansonr [Wed, 27 Jun 2018 10:20:25 +0000 (11:20 +0100)]
JAL-3032 part2 local file reading by JFileChooser
This commit adds the ALignFrame changes for handling the
JalviewFileChooser callback.
hansonr [Wed, 27 Jun 2018 10:15:22 +0000 (11:15 +0100)]
Consensus LOGO done
hansonr [Wed, 27 Jun 2018 10:14:00 +0000 (11:14 +0100)]
Consensus LOGO done
hansonr [Wed, 27 Jun 2018 08:53:54 +0000 (09:53 +0100)]
JAL-3032 fixes missing ToolTip
Jim Procter [Wed, 27 Jun 2018 07:42:22 +0000 (08:42 +0100)]
JAL-3033 tarball from site
Jim Procter [Tue, 26 Jun 2018 17:39:35 +0000 (18:39 +0100)]
Merge branch 'develop' into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 17:38:03 +0000 (18:38 +0100)]
Merge branch 'task/JAL-3042_remove_SimpleDocument_dependency' into develop
Jim Procter [Tue, 26 Jun 2018 17:37:27 +0000 (18:37 +0100)]
JAL-3042 remove mention of adjustable search box history length from docs
Jim Procter [Tue, 26 Jun 2018 14:37:38 +0000 (15:37 +0100)]
JAL-3042 don't allow user to change default history length for an input box
gmungoc [Tue, 26 Jun 2018 17:08:13 +0000 (18:08 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 16:57:44 +0000 (17:57 +0100)]
JAL-3035 removed jdas in libs documentation and noted spring modules as candidates for removal
gmungoc [Tue, 26 Jun 2018 16:57:05 +0000 (17:57 +0100)]
JAL-3032 don't draw AlphaComposite.Clear on background
Jim Procter [Tue, 26 Jun 2018 16:55:04 +0000 (17:55 +0100)]
JAL-3033 JAL-3035 remove jdas.jar from .classpath.js
Jim Procter [Tue, 26 Jun 2018 16:08:17 +0000 (17:08 +0100)]
Merge branch 'develop' into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 16:07:02 +0000 (17:07 +0100)]
Merge branch 'tasks/JAL-3035_remove_dasobert_dependency' into develop
Jim Procter [Tue, 26 Jun 2018 16:06:40 +0000 (17:06 +0100)]
JAL-3035 documentation in 2.11 release notes (and 2.11 fictional release date)
Jim Procter [Tue, 26 Jun 2018 16:06:12 +0000 (17:06 +0100)]
JAL-3035 remove DAS UI documentation
Jim Procter [Tue, 26 Jun 2018 15:40:46 +0000 (16:40 +0100)]
Merge branch 'tasks/JAL-3035_remove_dasobert_dependency' into develop
Jim Procter [Tue, 26 Jun 2018 15:38:14 +0000 (16:38 +0100)]
Merge branch 'tasks/JAL-3035_remove_dasobert_dependency' into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 15:16:15 +0000 (16:16 +0100)]
JAL-3035 - jalview-das is no more !
- jsdas lib removed
- DAS settings panel deleted (Feature settings pane has no tabs now)
- all code for wrapping DAS sources and retrieving sequences and features from them is gone
- test methods/main methods have been de-dasified or removed if their only purpose was to test DAS source discovery
- fancy sorting code to account for DAS sequence source names has been removed
Jim Procter [Tue, 26 Jun 2018 15:09:45 +0000 (16:09 +0100)]
JAL-3035 (unrelated) random XML error in nbbuild.xml
gmungoc [Tue, 26 Jun 2018 15:08:50 +0000 (16:08 +0100)]
JAL-3032 updateOverviewImage on construction
Jim Procter [Tue, 26 Jun 2018 09:29:09 +0000 (10:29 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
hansonr [Tue, 26 Jun 2018 09:13:07 +0000 (10:13 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 09:13:03 +0000 (10:13 +0100)]
JAL-3033 force overwrite for .classpath from .classpath.js
hansonr [Tue, 26 Jun 2018 09:11:25 +0000 (10:11 +0100)]
synchronize fixed
Jim Procter [Tue, 26 Jun 2018 08:59:28 +0000 (09:59 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
Jim Procter [Tue, 26 Jun 2018 08:57:14 +0000 (09:57 +0100)]
JAL-3033 fail if the transpiler isn’t updated from swingjs/…
Jim Procter [Tue, 26 Jun 2018 08:56:51 +0000 (09:56 +0100)]
JAL-3033 local build server path for eclipse
gmungoc [Tue, 26 Jun 2018 07:50:54 +0000 (08:50 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
gmungoc [Tue, 26 Jun 2018 07:49:32 +0000 (08:49 +0100)]
JAL-3032 don't place desktop at negative x or y position
Jim Procter [Mon, 25 Jun 2018 16:03:49 +0000 (17:03 +0100)]
JAL-3033 more copy/git debugging of task
Jim Procter [Mon, 25 Jun 2018 15:53:54 +0000 (16:53 +0100)]
JAL-3033 copy the right .classpath.js !
Jim Procter [Mon, 25 Jun 2018 15:50:05 +0000 (16:50 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
Jim Procter [Mon, 25 Jun 2018 15:48:00 +0000 (16:48 +0100)]
JAL-3033 update the eclipse project before building, edit class path, and copy artefacts from eclipse project back to build directory
Jim Procter [Mon, 25 Jun 2018 15:40:45 +0000 (16:40 +0100)]
JAL-3033 custom .classpath for eclipse build
hansonr [Mon, 25 Jun 2018 14:27:41 +0000 (15:27 +0100)]
menu enable/disable for radio and checkbox items
hansonr [Mon, 25 Jun 2018 14:08:10 +0000 (15:08 +0100)]
String.concat$S missing
hansonr [Mon, 25 Jun 2018 13:55:15 +0000 (14:55 +0100)]
fix for fix for Character.toTitleCase
hansonr [Mon, 25 Jun 2018 13:44:02 +0000 (14:44 +0100)]
Collections difference Apache vs Oracle
<E> vs <T> for SingletonList
hansonr [Mon, 25 Jun 2018 13:37:13 +0000 (14:37 +0100)]
Collections difference Apache vs Oracle
<E> vs <T> for SingletonList
Jim Procter [Mon, 25 Jun 2018 12:23:20 +0000 (13:23 +0100)]
JAL-3033 try to configure eclipse workspace via property
Jim Procter [Mon, 25 Jun 2018 12:03:12 +0000 (13:03 +0100)]
JAL-3033 working ant target for headless build of jalviewjs
hansonr [Mon, 25 Jun 2018 11:48:56 +0000 (12:48 +0100)]
adds MouseEvent.preciseWheelRotation
Jim Procter [Mon, 25 Jun 2018 11:47:50 +0000 (12:47 +0100)]
JAL-3033 comment about testing if eclipse build completed
Jim Procter [Mon, 25 Jun 2018 11:46:14 +0000 (12:46 +0100)]
JAL-3033 configure dropins, run eclipse build and copy in resources in a single task
hansonr [Mon, 25 Jun 2018 11:20:58 +0000 (12:20 +0100)]
synchronized() fix; to/isTitleCase() as ...UpperCase()
Jim Procter [Mon, 25 Jun 2018 10:48:11 +0000 (11:48 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into tasks/JAL-3033_jalviewjs_ant
hansonr [Mon, 25 Jun 2018 10:07:38 +0000 (11:07 +0100)]
new SwingJS-site.zip and net.sf.j2s.core.jar
fixes synchronized()
fixes new int[] {'a'}
hansonr [Mon, 25 Jun 2018 05:47:42 +0000 (06:47 +0100)]
// BH 6/24/2018 -- synchronized
synchronized(a = new Object()) {...} ---> ...; only if an assignment or
not a simple function call to Object.getTreeLock()
hansonr [Sun, 24 Jun 2018 22:56:52 +0000 (23:56 +0100)]
JMenu/JMenuItem enable/disable
uses
$(node).[add/remove]Class("ui-menu-disabled ui-state-disabled");
hansonr [Sun, 24 Jun 2018 18:13:41 +0000 (19:13 +0100)]
Dialog motif:
// BH 2018 -- providing a callback for SwingJS
// dialogOption is just a simple way to provide
// context for the modal-like response.
// The only requirement is that desktop implement
// PropertyChangeListener, which is used already in Java
// for changes in input value and such within the dialogs.
String dialogOption = "label.input_alignment_from_url";
desktop.dialogData = new Object[] { dialogOption, viewport, history
};
desktop.onDialogReturn(
JvOptionPane.showInternalConfirmDialog(desktop, panel,
MessageManager.getString(dialogOption),
JvOptionPane.OK_CANCEL_OPTION));
// no code may follow this, as SwingJS will not block
// callback in JavaScript comes via a property change event,
// thus going into desktop.onDialogReturn(int) just the same as
// in Java.
hansonr [Sun, 24 Jun 2018 10:28:43 +0000 (11:28 +0100)]
asynchronous modal dialogs using PropertyChangeListener for JavaScript
hansonr [Sun, 24 Jun 2018 08:58:19 +0000 (09:58 +0100)]
JFrame fix for Window->JComponent
hansonr [Sun, 24 Jun 2018 07:13:44 +0000 (08:13 +0100)]
JAL-3032
Update complete for
- menubar background
- direct running of Jalview.main(args)
- InternalFrame production
hansonr [Sun, 24 Jun 2018 07:11:53 +0000 (08:11 +0100)]
AlignmentFrame opacity set to TRUE for JavaScript.
This seems to be some sort of JavaScript fluke, because if you set the
background color of an internal div to opaque but then set the
background color of that div's parent to transparent, then it goes
transparent.
hansonr [Sun, 24 Jun 2018 07:09:48 +0000 (08:09 +0100)]
default MenuBar menu background color
set to lighter grey to match Frame color (#EEEEEE) in
HTMLLookAndFeel.java
hansonr [Sun, 24 Jun 2018 05:47:41 +0000 (06:47 +0100)]
typo in swingjs/plaf/HTML5LookAndFeel.java
hansonr [Sun, 24 Jun 2018 05:05:08 +0000 (06:05 +0100)]
typo in synchronized() fix
hansonr [Sat, 23 Jun 2018 23:00:33 +0000 (00:00 +0100)]
org.json.simple
hansonr [Sat, 23 Jun 2018 23:00:07 +0000 (00:00 +0100)]
JAL-3032 BrowserLauncher simplified for JS
window.open(url)
hansonr [Sat, 23 Jun 2018 22:59:19 +0000 (23:59 +0100)]
moving SwingJS-site.zip to /swingjs/
hansonr [Sat, 23 Jun 2018 17:01:20 +0000 (18:01 +0100)]
RELATIVE_URL
hansonr [Sat, 23 Jun 2018 16:59:46 +0000 (17:59 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Sat, 23 Jun 2018 16:57:20 +0000 (17:57 +0100)]
JAL-3026 JDesktop/JInternalFrames support + relative URL file loading
- preliminary
- no minimization to JDesktopIcon
- no maximization
- z-order not checked
See JalviewJS2.java
new SwingJS-site.zip
AlignFrame.java:
JS bypass for addServiceListeners()
AppletFormatAdapter.java:
DataSourceType.java:
FileParse.java:
adds DataSourceType.RELATIVE_URL
for indicating files relative to the HTML page.
Desktop.java:
JS bypass for Console, Dialog Thread, News, Vamsas, and URL links
Jalview.java
JS bypass forparsing h, help, nodisplay, nogui, jabaws, startup example.
gmungoc [Fri, 22 Jun 2018 15:06:37 +0000 (16:06 +0100)]
JAL-3032 avoid assignments on the same line as synchronized
gmungoc [Fri, 22 Jun 2018 13:49:22 +0000 (14:49 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
gmungoc [Fri, 22 Jun 2018 13:49:17 +0000 (14:49 +0100)]
JAL-3030 size split frame taller
hansonr [Fri, 22 Jun 2018 13:45:53 +0000 (14:45 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
hansonr [Fri, 22 Jun 2018 13:45:10 +0000 (14:45 +0100)]
fix for no access-control-origin on jalview site
Jim Procter [Fri, 22 Jun 2018 13:34:00 +0000 (14:34 +0100)]
JAL-3033 formatting
Jim Procter [Fri, 22 Jun 2018 13:33:50 +0000 (14:33 +0100)]
JAL-3033 WIP ant tasks for jalviewjs
gmungoc [Fri, 22 Jun 2018 10:04:04 +0000 (11:04 +0100)]
JAL-3032 more informative failure message
hansonr [Fri, 22 Jun 2018 09:00:54 +0000 (10:00 +0100)]
JInternalFrame implemented as such; no need for JSInternalFrame