hansonr [Fri, 1 Feb 2019 13:45:25 +0000 (07:45 -0600)]
fix for org.json.JSONObject writing (both in Java and JavaScript)
hansonr [Fri, 1 Feb 2019 13:44:50 +0000 (07:44 -0600)]
removes unnecessary org.xml.sax; these are in SwingJS
Ben Soares [Fri, 1 Feb 2019 09:42:13 +0000 (09:42 +0000)]
JAL-3141 Slight efficiency gain in detecting backupfiles in the File Chooser
hansonr [Thu, 31 Jan 2019 06:29:21 +0000 (00:29 -0600)]
Split pane removing title bar for JInternalFrames
hansonr [Thu, 31 Jan 2019 00:11:41 +0000 (18:11 -0600)]
fixes org.json.JSONObject for fully qualified method signatures
hansonr [Thu, 31 Jan 2019 00:11:06 +0000 (18:11 -0600)]
removes org.json from srcjar
gmungoc [Wed, 30 Jan 2019 16:05:51 +0000 (16:05 +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
Conflicts:
src/jalview/gui/SequenceFetcher.java
gmungoc [Wed, 30 Jan 2019 15:40:53 +0000 (15:40 +0000)]
JAL-3144 don't change comma to semi-colon if not requested!
hansonr [Wed, 30 Jan 2019 15:26:02 +0000 (09:26 -0600)]
woops.
hansonr [Wed, 30 Jan 2019 14:57:38 +0000 (08:57 -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 [Wed, 30 Jan 2019 14:57:21 +0000 (08:57 -0600)]
Fix for textarea not updating value ("value", not "innerHTML")
hansonr [Wed, 30 Jan 2019 14:56:52 +0000 (08:56 -0600)]
fixes unidentified Java problem
when pasted text has white space trailing or preceding, error was
indicated that "" could not be loaded.
gmungoc [Wed, 30 Jan 2019 10:55:05 +0000 (10:55 +0000)]
JAL-3056 no export as BioJS in JalviewJS
Ben Soares [Wed, 30 Jan 2019 10:10:42 +0000 (10:10 +0000)]
JAL-3141 Enabled the 'Include backpup files' checkbox for loading alignments from local file
hansonr [Tue, 29 Jan 2019 21:11:05 +0000 (15:11 -0600)]
classpath to include test always
hansonr [Tue, 29 Jan 2019 21:10:46 +0000 (15:10 -0600)]
JSON writing fix, JColorChooser (mnemonic change) fix
hansonr [Tue, 29 Jan 2019 18:52:22 +0000 (12:52 -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, 29 Jan 2019 18:52:02 +0000 (12:52 -0600)]
test package fix for List<DBRefEntry> DBrefs (untested)
Ben Soares [Tue, 29 Jan 2019 14:15:51 +0000 (14:15 +0000)]
JAL-3141 Found a good fix for updating the FileChooser list of files when 'Include backup files' checkbox is checked/unchecked.
Ben Soares [Tue, 29 Jan 2019 11:41:52 +0000 (11:41 +0000)]
JAL-3141 Found a (not ideal) fix for updating the FileChooser list of files when 'Include backup files' checkbox is checked/unchecked.
gmungoc [Tue, 29 Jan 2019 11:33:12 +0000 (11:33 +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 [Tue, 29 Jan 2019 11:32:18 +0000 (11:32 +0000)]
Merge branch 'feature/JAL-3143ensemblJSON' into trialMerge
Conflicts:
src/jalview/ext/ensembl/EnsemblFeatures.java
gmungoc [Tue, 29 Jan 2019 11:17:48 +0000 (11:17 +0000)]
JAL-3143 format alleles array for feature description
hansonr [Tue, 29 Jan 2019 07:39:55 +0000 (01:39 -0600)]
Fetch Sequences...PDB - all tabs working
Could still be a problem with panels being moved to and from being
content panes.
hansonr [Tue, 29 Jan 2019 03:20:51 +0000 (21:20 -0600)]
experiment using a register buffer instead of creating thousands of
int[]. Turns out, it's no diffent in Chrome.
hansonr [Tue, 29 Jan 2019 03:04:35 +0000 (21:04 -0600)]
timing notes; SwingJS for StringBuilder/Buffer
hansonr [Tue, 29 Jan 2019 03:03:15 +0000 (21:03 -0600)]
iterators
hansonr [Tue, 29 Jan 2019 03:00:52 +0000 (21:00 -0600)]
time check, iterators
hansonr [Tue, 29 Jan 2019 03:00:31 +0000 (21:00 -0600)]
JSON moved to swingjs/json
hansonr [Tue, 29 Jan 2019 02:02:24 +0000 (20:02 -0600)]
JSON code moved to swingjs.json.JSON
hansonr [Tue, 29 Jan 2019 02:01:45 +0000 (20:01 -0600)]
more iterators out; some time checks
gmungoc [Mon, 28 Jan 2019 14:59:27 +0000 (14:59 +0000)]
JAL-3032 revert change to tooltip StringBuilder length
Ben Soares [Mon, 28 Jan 2019 10:53:32 +0000 (10:53 +0000)]
JAL-3141 improvement on BackupFilenameParts filename matching
Ben Soares [Mon, 28 Jan 2019 10:06:11 +0000 (10:06 +0000)]
JAL-3141 fixed test
hansonr [Sat, 26 Jan 2019 16:58:31 +0000 (10:58 -0600)]
final timing checks for optimization
hansonr [Sat, 26 Jan 2019 16:58:04 +0000 (10:58 -0600)]
Platform.timecheck calls removed or commented out.
hansonr [Sat, 26 Jan 2019 05:51:50 +0000 (23:51 -0600)]
removing cyclic call
hansonr [Sat, 26 Jan 2019 05:13:29 +0000 (23:13 -0600)]
Jalview.isJS() --> Platform.isJS(), DBRefEntry[] --> List<DBRefEntry>
hansonr [Sat, 26 Jan 2019 04:06:47 +0000 (22:06 -0600)]
timestamp just before major refactoring in relation to preliminary
contructor/iterator optimization
Ben Soares [Fri, 25 Jan 2019 17:32:37 +0000 (17:32 +0000)]
JAL-3141. This adds quite a lot of code to allow an 'Include backup files' checkbox in the 'Load Project' JalviewFileChooser. However I cannot for the life of me get the file list in the FileChooser to refresh /reliably/ on a mac at least anyway (it does about 1 time in 9git status).
hansonr [Fri, 25 Jan 2019 09:25:18 +0000 (03:25 -0600)]
SwingJS update (maybe nothing?)
hansonr [Fri, 25 Jan 2019 09:24:52 +0000 (03:24 -0600)]
timing code
hansonr [Fri, 25 Jan 2019 09:24:37 +0000 (03:24 -0600)]
JSON refactoring
hansonr [Fri, 25 Jan 2019 09:23:54 +0000 (03:23 -0600)]
JavaScript browser-based JSON parsing
hansonr [Fri, 25 Jan 2019 09:23:21 +0000 (03:23 -0600)]
Timing code
Ben Soares [Thu, 24 Jan 2019 16:54:21 +0000 (16:54 +0000)]
JAL-3141 Added a '.fa' to filename examples
Ben Soares [Thu, 24 Jan 2019 16:47:43 +0000 (16:47 +0000)]
JAL-3141 Change of label (change of '_' character to ' ')
Ben Soares [Thu, 24 Jan 2019 16:33:11 +0000 (16:33 +0000)]
JAL-3141 Change of label
Ben Soares [Thu, 24 Jan 2019 16:25:26 +0000 (16:25 +0000)]
JAL-3141 Removed border around example filenames in Backups Preferences pane
Ben Soares [Thu, 24 Jan 2019 15:56:58 +0000 (15:56 +0000)]
JAL-3141 New layout and wording of Backups Preferences pane after consultation with SD. Seriously rationalised 'backupfiles...SetEnable' to allow for more complex widget enabling/disabling depending on other widget values. Fixed a buglet or two when there's an unusual selection of options (when suffix has no '%n' or is completely empty).
Ben Soares [Thu, 24 Jan 2019 15:29:54 +0000 (15:29 +0000)]
JAL-3141 Eclipse re-formatting of file
gmungoc [Thu, 24 Jan 2019 14:30:31 +0000 (14:30 +0000)]
JAL-3018 Ensembl version updated to 9.0
hansonr [Thu, 24 Jan 2019 13:13:30 +0000 (07:13 -0600)]
adds File..Load Project file for JS
hansonr [Thu, 24 Jan 2019 12:24:10 +0000 (06:24 -0600)]
fixes DnD
Ben Soares [Thu, 24 Jan 2019 09:37:05 +0000 (09:37 +0000)]
JAL-3141 Reformatted code in eclipse
hansonr [Wed, 23 Jan 2019 21:27:02 +0000 (15:27 -0600)]
added _j2sclasslist.txt for buildcore.xml and
jalview_bin_JalviewJS_core.html
hansonr [Wed, 23 Jan 2019 21:19:59 +0000 (15:19 -0600)]
Menus close properly, toolips restored
minor bug in SeqPanel I introduced some time ago.
Ben Soares [Wed, 23 Jan 2019 20:33:20 +0000 (20:33 +0000)]
JAL-3141 Added Presets options in the Backups Preferences pane, with several presets available and sensible 'Default' option chosen first time.
hansonr [Wed, 23 Jan 2019 16:32:10 +0000 (10:32 -0600)]
menu, slider work
gmungoc [Wed, 23 Jan 2019 09:15:52 +0000 (09:15 +0000)]
JAL-3063 correct handling of absent choice element in DBRef Mapping
hansonr [Tue, 22 Jan 2019 14:18:17 +0000 (08:18 -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, 22 Jan 2019 14:17:58 +0000 (08:17 -0600)]
Float.isInfinite, popup menus, slider, spinner redux
Ben Soares [Tue, 22 Jan 2019 13:15:08 +0000 (13:15 +0000)]
JAL-3141 Fixed what happens when suffix template has no '%n' index
Ben Soares [Tue, 22 Jan 2019 13:14:06 +0000 (13:14 +0000)]
JAL-3141 New message translations
gmungoc [Tue, 22 Jan 2019 10:53:47 +0000 (10:53 +0000)]
Tests for methods of Float
hansonr [Tue, 22 Jan 2019 05:41:01 +0000 (23:41 -0600)]
recompiled libs; JSONException fixed, JSlider, JSpinner
Ben Soares [Mon, 21 Jan 2019 22:56:41 +0000 (22:56 +0000)]
JAL-3141 Rejigged the Preferences tab and changed some text
hansonr [Mon, 21 Jan 2019 18:46:50 +0000 (12:46 -0600)]
added Platform settings separating mouse use of win/mac difference
hansonr [Mon, 21 Jan 2019 18:23:59 +0000 (12:23 -0600)]
added Platform settings separating mouse use of win/mac difference
hansonr [Mon, 21 Jan 2019 17:39:57 +0000 (11:39 -0600)]
isAMac() -> isAMacAndNotJS(), isWindows() -> isWindowsAndNotJS()
Added Platform.isWin[Right|Middle]Button()
hansonr [Mon, 21 Jan 2019 17:38:23 +0000 (11:38 -0600)]
isAMac() -> isAMacAndNotJS(), isWindows() -> isWindowsAndNotJS()
Added Platform.isWin[Right|Middle]Button()
hansonr [Mon, 21 Jan 2019 16:57:25 +0000 (10:57 -0600)]
minor Platform.isAMac() clean up
removes secondary references "MAC"
changes unnecessary instance creation new Platform().isAMac()
hansonr [Mon, 21 Jan 2019 16:46:54 +0000 (10:46 -0600)]
removing indirect references to Platform.isAMac()
hansonr [Mon, 21 Jan 2019 16:42:13 +0000 (10:42 -0600)]
comments only
Ben Soares [Mon, 21 Jan 2019 13:51:48 +0000 (13:51 +0000)]
JAL-3141 Fixed tests for new placement of suffix after extension
hansonr [Mon, 21 Jan 2019 06:08:38 +0000 (00:08 -0600)]
fixes popup issue involving invocation from mousePressed event.
hansonr [Mon, 21 Jan 2019 04:52:03 +0000 (22:52 -0600)]
menu update; popup not functioning, though?? Working fine in test suite.
Will test.
hansonr [Mon, 21 Jan 2019 04:52:03 +0000 (22:52 -0600)]
menu update; popup not functioning, though?? Working fine in test suite.
Will test.
Ben Soares [Sun, 20 Jan 2019 15:50:31 +0000 (15:50 +0000)]
JAL-3141 removing diagnostic output
Ben Soares [Sun, 20 Jan 2019 01:10:59 +0000 (01:10 +0000)]
JAL-3141 Fixed example filenames in Preferences pane (no extension in BackupFiles now), and new default template.
Ben Soares [Sun, 20 Jan 2019 00:08:14 +0000 (00:08 +0000)]
JAL-3141 Changed suffix position to after the extension (removed extension detection altogether), and changed initial defaults.
Ben Soares [Sun, 20 Jan 2019 00:03:26 +0000 (00:03 +0000)]
JAL-3141 Re-added some changes in Jalview2XML missed in the merge
hansonr [Sat, 19 Jan 2019 13:08:20 +0000 (07:08 -0600)]
menu bug preventing closing - recompiled
Jim Procter [Fri, 18 Jan 2019 14:18:57 +0000 (14:18 +0000)]
Merge branch 'feature/JAL-3063jaxbNoCastor' into feature/JAL-3141_Create_a_backup_when_saving_projects_and_other_files
JAL-3063 switched from castor to JAXB - backupFile bits added to jalview.project.Jalview2XML
Jim Procter [Fri, 18 Jan 2019 14:06:09 +0000 (14:06 +0000)]
Merge branch 'develop' into feature/JAL-3063jaxbNoCastor
gmungoc [Fri, 18 Jan 2019 09:59:45 +0000 (09:59 +0000)]
JAL-3143 'id' not 'ID' attribute drives generation of variant link
hansonr [Fri, 18 Jan 2019 09:19:35 +0000 (03:19 -0600)]
menu bug preventing closing
I see the problem with label icons offset. Something I did when I was
doing mnemonics, I think....
hansonr [Fri, 18 Jan 2019 08:57:57 +0000 (02:57 -0600)]
canvas line/font/pixel fixes; menu accelerators;
gmungoc [Thu, 17 Jan 2019 15:29:29 +0000 (15:29 +0000)]
Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
Conflicts:
.gitignore
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/commands/EditCommand.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/ScalePanel.java
Jim Procter [Thu, 17 Jan 2019 12:29:06 +0000 (12:29 +0000)]
JAL-3116 clear out whitespace when materialising Sequence object from Uniprot XML
Ben Soares [Wed, 16 Jan 2019 14:27:12 +0000 (14:27 +0000)]
JAL-3141 Remove no longer used exampleLabel
Jim Procter [Wed, 16 Jan 2019 11:50:22 +0000 (11:50 +0000)]
Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
JAL-3063 todo: add castor-1.1-cycle.jar back to libraries inorder to ensure VAMSAS functionality remains
Jim Procter [Wed, 16 Jan 2019 11:38:15 +0000 (11:38 +0000)]
Merge branch 'features/pca_jaxb_datasetrefs_JAL-3171_JAL-3063_JAL-1767' into develop
hansonr [Tue, 15 Jan 2019 19:18:38 +0000 (13:18 -0600)]
removal of AlignmentFrame lines
hansonr [Tue, 15 Jan 2019 19:17:16 +0000 (13:17 -0600)]
subimage height error
Jim Procter [Tue, 15 Jan 2019 13:12:10 +0000 (13:12 +0000)]
JAL-1767 test that changing view association for PCA panel can be restored
Jim Procter [Tue, 15 Jan 2019 13:10:42 +0000 (13:10 +0000)]
JAL-1767 refactor associated view logic to public method and synchronise PCAPanel.av/ap with RotateableCanvac.ap/av
Jim Procter [Tue, 15 Jan 2019 11:19:39 +0000 (11:19 +0000)]
JAL-1767 patch buggy PCA view association test
Ben Soares [Mon, 14 Jan 2019 23:53:16 +0000 (23:53 +0000)]
JAL-3141 Forgot this file, sorry!
Ben Soares [Mon, 14 Jan 2019 23:47:38 +0000 (23:47 +0000)]
JAL-3141 Added a 'Save Project as...' File menu item, always asks for filename. Altered 'Save Project' File menu item to automatically save if both 1) projectFile is set (e.g. loaded or previously saved), 2) Backups is enabled