gmungoc [Mon, 30 Mar 2020 10:51:45 +0000 (11:51 +0100)]
Merge branch 'develop' into Jalview-JS/develop
Conflicts:
.gitignore
build.gradle
gradle.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/JvSwingUtils.java
src/jalview/util/MessageManager.java
test/jalview/gui/AlignmentPanelTest.java
test/jalview/gui/JvSwingUtilsTest.java
test/jalview/gui/PopupMenuTest.java
utils/eclipse/org.eclipse.jdt.core.jalview.prefs
soares [Fri, 27 Mar 2020 16:08:13 +0000 (16:08 +0000)]
JAL-3225 updated essential files for eclipse project if buildship fails
soares [Fri, 27 Mar 2020 16:08:13 +0000 (16:08 +0000)]
JAL-3225 updated essential files for eclipse project if buildship fails
Ben Soares [Thu, 26 Mar 2020 20:22:52 +0000 (20:22 +0000)]
JAL-3225 Also look for local.properties in file named ../${projectDir}_local.properties. This allows multiple instances of the same project in Eclipse by changing the eclipse_project_name propert (and other local properties)
soares [Thu, 26 Mar 2020 17:37:44 +0000 (17:37 +0000)]
JAL-3225 This one file needed for project if git clean -dfx run
soares [Thu, 26 Mar 2020 17:37:44 +0000 (17:37 +0000)]
JAL-3225 This one file needed for project if git clean -dfx run
soares [Thu, 26 Mar 2020 17:32:52 +0000 (17:32 +0000)]
JAL-3225 fix comparing Eclispe IDE j2s plugin and this branch j2s plugin
Ben Soares [Thu, 26 Mar 2020 17:13:40 +0000 (17:13 +0000)]
JAL-3225 All of .settings now gitignored. org.eclipse...prefs made by buildship or gradle eclipse. Jalview specific prefs pulled in from utils/eclipse/org.eclipse.jdt.core.jalview.prefs
Ben Soares [Thu, 26 Mar 2020 17:13:40 +0000 (17:13 +0000)]
JAL-3225 All of .settings now gitignored. org.eclipse...prefs made by buildship or gradle eclipse. Jalview specific prefs pulled in from utils/eclipse/org.eclipse.jdt.core.jalview.prefs
Ben Soares [Wed, 25 Mar 2020 17:07:36 +0000 (17:07 +0000)]
JAL-3248 Added instructions for downloading and configuring as gradle project in Eclipse only, i.e. no command line tools needed
soares [Wed, 25 Mar 2020 13:39:41 +0000 (13:39 +0000)]
JAL-3210 fix an undefined copyPlugin var and improved warning in Eclipse console when copying plugin
soares [Wed, 25 Mar 2020 01:57:40 +0000 (01:57 +0000)]
JAL-3210 Fixed Eclipse IDE usage
soares [Tue, 24 Mar 2020 17:00:32 +0000 (17:00 +0000)]
JAL-3210 New site-resources dir too
soares [Tue, 24 Mar 2020 15:35:03 +0000 (15:35 +0000)]
JAL-3210 New version of swingjs and supporting .zip libraries. Swing-JS version 3.2.9.v1e
soares [Tue, 24 Mar 2020 15:32:14 +0000 (15:32 +0000)]
JAL-3210 adjustment to build.gradle, gradle.properties to look for net.sf.j2s.core-j11.jar
Jim Procter [Fri, 20 Mar 2020 18:19:52 +0000 (18:19 +0000)]
JAL-3562 exclude testNG groups from a build via -PtestngExcludedGroups=Not-bamboo
Jim Procter [Fri, 20 Mar 2020 18:01:57 +0000 (18:01 +0000)]
JAL-3407 JAL-3562 release notes
Jim Procter [Fri, 20 Mar 2020 17:50:47 +0000 (17:50 +0000)]
JAL-3407 rejigging new features - simplify release note line for virtual features
Jim Procter [Fri, 20 Mar 2020 17:45:08 +0000 (17:45 +0000)]
JAL-3407 reformat releases.html
Jim Procter [Fri, 20 Mar 2020 17:27:01 +0000 (17:27 +0000)]
JAL-3407 JAL-3549 javadoc
Jim Procter [Fri, 20 Mar 2020 17:02:49 +0000 (17:02 +0000)]
JAL-3407 - release notes for JAL-3547
Jim Procter [Fri, 20 Mar 2020 17:01:53 +0000 (17:01 +0000)]
JAL-3549 javadoc
gmungoc [Thu, 19 Mar 2020 16:05:57 +0000 (16:05 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
Ben Soares [Thu, 19 Mar 2020 12:54:02 +0000 (12:54 +0000)]
JAL-3541 increase maxheapsize for test worker process
Ben Soares [Thu, 19 Mar 2020 12:35:45 +0000 (12:35 +0000)]
JAL-3541 tidying build.gradle, delete cloverInstrDir re-added
gmungoc [Thu, 19 Mar 2020 12:29:46 +0000 (12:29 +0000)]
JAL-3305 don't propagate an empty SelectionGroup to complement view
Ben Soares [Thu, 19 Mar 2020 12:26:41 +0000 (12:26 +0000)]
JAL-3541 put org.gradle.jvmargs explicitly into gradle.properties
Ben Soares [Wed, 18 Mar 2020 15:23:55 +0000 (15:23 +0000)]
JAL-3541 merged cleanClover with develop
Ben Soares [Wed, 18 Mar 2020 11:33:26 +0000 (11:33 +0000)]
JAL-3541 perhaps a better clean for clover. fixed
Ben Soares [Wed, 18 Mar 2020 11:21:37 +0000 (11:21 +0000)]
JAL-3541 perhaps a better clean for clover
Ben Soares [Tue, 17 Mar 2020 19:19:59 +0000 (19:19 +0000)]
JAL-3541 rejigged clover tasks very mildly
Ben Soares [Tue, 17 Mar 2020 12:42:25 +0000 (12:42 +0000)]
Revert "JAL-3541 trying out previous cloverReport task"
This reverts commit
dc70a1f7934471a4084c3f10e7bd630d72aa3bf3.
Ben Soares [Tue, 17 Mar 2020 11:28:17 +0000 (11:28 +0000)]
JAL-3541 trying out previous cloverReport task
Jim Procter [Mon, 16 Mar 2020 17:51:38 +0000 (17:51 +0000)]
JAL-3407 JAL-3187 help documentation for virtual features and tabbed feature settings for linked cds/protein views
Jim Procter [Mon, 16 Mar 2020 17:42:45 +0000 (17:42 +0000)]
JAL-3407 JAL-3549 explicitly mention the ‘no features’ dialog, and how an existing selection affects the sort alignment by feature score/density
Jim Procter [Mon, 16 Mar 2020 17:00:07 +0000 (17:00 +0000)]
JAL-3407 group together ‘virtual feature’ related features in release notes
Jim Procter [Mon, 16 Mar 2020 10:57:16 +0000 (10:57 +0000)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
Ben Soares [Thu, 12 Mar 2020 14:44:57 +0000 (14:44 +0000)]
JAL-3394 updated version if install4j gradle plugin
gmungoc [Mon, 9 Mar 2020 14:54:16 +0000 (14:54 +0000)]
JAL-3528 unit tests added for failed lookup, Javadoc
gmungoc [Mon, 9 Mar 2020 13:12:18 +0000 (13:12 +0000)]
JAL-3407 3549 in release notes
gmungoc [Mon, 9 Mar 2020 13:06:05 +0000 (13:06 +0000)]
JAL-3549 JAL-3305 no Sort By Score / Density if no features visible
gmungoc [Mon, 9 Mar 2020 10:26:59 +0000 (10:26 +0000)]
JAL-3412 update layout whenever desired id width changes
gmungoc [Fri, 6 Mar 2020 16:06:20 +0000 (16:06 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Fri, 6 Mar 2020 16:06:13 +0000 (16:06 +0000)]
JAL-3187 unit test for findComplementFeaturesAtResidue
Ben Soares [Fri, 6 Mar 2020 15:08:50 +0000 (15:08 +0000)]
JAL-3394 getdown jar files had not been re-compiled
gmungoc [Fri, 6 Mar 2020 14:09:20 +0000 (14:09 +0000)]
JAL-3407 added 3468 to release notes
gmungoc [Fri, 6 Mar 2020 14:01:25 +0000 (14:01 +0000)]
Merge branch 'feature/JAL-3468featureDescriptionEllipsis' into develop
gmungoc [Fri, 6 Mar 2020 13:59:36 +0000 (13:59 +0000)]
JAL-3468 i18n and additional unit tests
gmungoc [Fri, 6 Mar 2020 11:17:25 +0000 (11:17 +0000)]
JAL-3407 release note tweaks, added 3533 3538 3534 2764 3541
Jim Procter [Thu, 5 Mar 2020 12:31:13 +0000 (12:31 +0000)]
Merge branch 'improvement/JAL-3543_dont_report_null_versions_in_java_console' into develop
Ben Soares [Wed, 4 Mar 2020 11:05:01 +0000 (11:05 +0000)]
JAL-3468 small tidy
Ben Soares [Wed, 4 Mar 2020 11:02:18 +0000 (11:02 +0000)]
JAL-3468 improvement to feature description truncation when <a> links in text
Ben Soares [Wed, 4 Mar 2020 02:14:11 +0000 (02:14 +0000)]
JAL-3468 Fixed tests and added test for max-length of feature set tooltip
Ben Soares [Wed, 4 Mar 2020 02:13:25 +0000 (02:13 +0000)]
JAL-3468 Obsessively fixed self-closing <br/> tags
soares [Tue, 3 Mar 2020 20:40:03 +0000 (20:40 +0000)]
JAL-3468 Adapted methods to report how many features have been dropped from the tooltip, and add final note to tooltip. Backward compatible methods left in.
Jim Procter [Tue, 3 Mar 2020 09:07:09 +0000 (09:07 +0000)]
Merge branch 'groovy/JAL-3547_conservationsequenceexport' into develop
Jim Procter [Tue, 3 Mar 2020 09:06:16 +0000 (09:06 +0000)]
JAL-3547 groovy script to get the conservation sequence and output it as fasta
Jim Procter [Mon, 2 Mar 2020 10:42:07 +0000 (10:42 +0000)]
JAL-3407 redact Java 8 incompatible '<>' with anonymous inner classes
Jim Procter [Thu, 27 Feb 2020 17:27:41 +0000 (17:27 +0000)]
Merge branch 'bug/JAL-3412idWidthDiscrepancy' into develop
Jim Procter [Thu, 27 Feb 2020 17:27:18 +0000 (17:27 +0000)]
JAL-3407 release notes for JAL-3412
Jim Procter [Thu, 27 Feb 2020 17:15:24 +0000 (17:15 +0000)]
JAL-3412 patch for failing test
Ben Soares [Thu, 27 Feb 2020 16:23:04 +0000 (16:23 +0000)]
JAL-3543 remove debugging output
Ben Soares [Thu, 27 Feb 2020 16:18:02 +0000 (16:18 +0000)]
Merge branch 'develop' into improvement/JAL-3543_dont_report_null_versions_in_java_console
Merging with develop
Ben Soares [Thu, 27 Feb 2020 16:09:30 +0000 (16:09 +0000)]
JAL-3543 Conditional reporting of Install4j and Getdown versions if null
Jim Procter [Thu, 27 Feb 2020 15:56:49 +0000 (15:56 +0000)]
Merge branch 'bug/JAL-3412idWidthDiscrepancy' into develop
Jim Procter [Thu, 27 Feb 2020 15:49:08 +0000 (15:49 +0000)]
JAL-3407 JAL-3296 release notes
Jim Procter [Thu, 27 Feb 2020 15:08:49 +0000 (15:08 +0000)]
Merge branch 'bug/JAL-3296changeStartInvalidateCursor' into develop
Jim Procter [Wed, 26 Feb 2020 16:58:58 +0000 (16:58 +0000)]
JAL-3477 jalview.jvmmemmax / jvmmemmax maximum value documentation
Jim Procter [Wed, 26 Feb 2020 16:55:54 +0000 (16:55 +0000)]
Merge branch 'bug/JAL-3477_memory_max_allocation' into develop
replaced all libs with libs onbug/JAL-3477_memory_max_allocation, though these will still need to be rebuilt (but how !)
Jim Procter [Wed, 26 Feb 2020 16:21:57 +0000 (16:21 +0000)]
JAL-3407 release notes for JAL-3449 JAL-3393 JAL-3420 JAL-3477 JAL-3447 JAL-3542
Jim Procter [Wed, 26 Feb 2020 14:52:19 +0000 (14:52 +0000)]
Merge branch 'improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalview_console.2' into develop
Jim Procter [Wed, 26 Feb 2020 14:33:20 +0000 (14:33 +0000)]
JAL-3541 docs for enabling OpenClover coverage reports and adjustable build parameters for troubleshooting report generation.
Jim Procter [Wed, 26 Feb 2020 11:22:39 +0000 (11:22 +0000)]
JAL-3541 removed clover report generation debug flag (utf-8 encoding enforcement seems to have fixed parsing of jalview.gui.desktop source)
Jim Procter [Wed, 26 Feb 2020 10:10:31 +0000 (10:10 +0000)]
JAL-3541 configurables for clover report generation (JVM heap, JVM args, and -v or -d for debugging)
Jim Procter [Tue, 25 Feb 2020 18:22:19 +0000 (18:22 +0000)]
JAL-3541 track own jalview.gui.Desktop clover source parsing error
Jim Procter [Tue, 25 Feb 2020 18:02:01 +0000 (18:02 +0000)]
JAL-3541 2g heap for clover xml and clover html - remove verbose on xml generation (did't actually need it !)
Jim Procter [Tue, 25 Feb 2020 17:44:10 +0000 (17:44 +0000)]
JAL-3541 add verbose and heap setting for HTML Report Generation
Jim Procter [Tue, 25 Feb 2020 17:10:19 +0000 (17:10 +0000)]
JAL-3541 use javaExec to run clover tasks
Jim Procter [Fri, 21 Feb 2020 17:18:34 +0000 (17:18 +0000)]
Merge branch 'bug/JAL-3536getCrossrefTwice' into develop
Jim Procter [Fri, 21 Feb 2020 15:12:18 +0000 (15:12 +0000)]
JAL-3186 ensure transparency slider position is updated on revert
Jim Procter [Fri, 21 Feb 2020 15:10:57 +0000 (15:10 +0000)]
JAL-3186 avoid repainting twice in splitframe
Jim Procter [Fri, 21 Feb 2020 14:36:32 +0000 (14:36 +0000)]
Merge branch 'features/JAL-3187_uitweaks' into develop
Jim Procter [Fri, 21 Feb 2020 14:34:21 +0000 (14:34 +0000)]
Merge branch 'develop' into features/JAL-3187_uitweaks
Jim Procter [Thu, 20 Feb 2020 17:25:27 +0000 (17:25 +0000)]
JAL-3187 nice to have enabling/disabling of apply/cancel when feature settings have not yet been modified for a view
Jim Procter [Thu, 20 Feb 2020 17:24:37 +0000 (17:24 +0000)]
JAL-3187 i18n
Jim Procter [Thu, 20 Feb 2020 17:24:08 +0000 (17:24 +0000)]
JAL-3187 use the recommended way of catching tab selection change events
gmungoc [Thu, 20 Feb 2020 16:20:08 +0000 (16:20 +0000)]
JAL-3187 repaint complement after loading on features
Jim Procter [Thu, 20 Feb 2020 14:11:06 +0000 (14:11 +0000)]
JAL-3187 individual feature settings panel has revert/apply when embedded in a tab, and split frame feature settings has an OK and Cancel.
Jim Procter [Wed, 19 Feb 2020 18:46:25 +0000 (18:46 +0000)]
JAL-3187 i18n for titles in windows/tabs
Jim Procter [Wed, 19 Feb 2020 18:43:45 +0000 (18:43 +0000)]
JAL-3535 todo re titles for CDS and Protein views in the feature settings dialog pane
Jim Procter [Wed, 19 Feb 2020 18:43:05 +0000 (18:43 +0000)]
JAL-3187 - tabbed pane is nulled when feature settings is closed but not featureSettingsUI - check both are non-null or reconstruct
Ben Soares [Wed, 19 Feb 2020 16:40:09 +0000 (16:40 +0000)]
Merge branch 'develop' into improvement/JAL-3449_add_install4j_installer_getdown_versions_to_jalview_console.2
Ben Soares [Wed, 19 Feb 2020 16:37:47 +0000 (16:37 +0000)]
JAL-3289 Improved the name of the channel_launch.jvl file to channel_launch-CHANNELNAMEWITHPLANKEY.jvl
Jim Procter [Wed, 19 Feb 2020 15:03:44 +0000 (15:03 +0000)]
JAL-3187 JAL-2764 close feature settings when parent align frame is closed (need to check feature settings is open before closing it :) )
Ben Soares [Wed, 19 Feb 2020 14:22:53 +0000 (14:22 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
Ben Soares [Wed, 19 Feb 2020 14:22:48 +0000 (14:22 +0000)]
JAL-3337 Adding .settings/org.eclipse.jdt.core.jalview.prefs file needed for gradle eclipse
Jim Procter [Wed, 19 Feb 2020 12:05:57 +0000 (12:05 +0000)]
Merge branch 'patch/JAL-3538_fontantialiasingbydefault' into develop
Jim Procter [Wed, 19 Feb 2020 12:05:33 +0000 (12:05 +0000)]
JAL-3538 JAL-3407 release notes
Jim Procter [Wed, 19 Feb 2020 12:03:45 +0000 (12:03 +0000)]
JAL-3407 release next week :D
Jim Procter [Wed, 19 Feb 2020 12:03:24 +0000 (12:03 +0000)]
JAL-3538 anti-aliasing enabled by default