Ben Soares [Thu, 6 Jun 2019 14:06:58 +0000 (15:06 +0100)]
JAL-3225 Classpath now made in eclipse.classpath.file.whenMerged and recognised by buildship :)
Ben Soares [Tue, 4 Jun 2019 15:30:10 +0000 (16:30 +0100)]
JAL-3287 correct local file URI for appbase and getdownDigest in Windows
Ben Soares [Tue, 4 Jun 2019 14:38:46 +0000 (15:38 +0100)]
JAL-3287 adjustment to HelpLinksChecker
Ben Soares [Tue, 4 Jun 2019 14:28:13 +0000 (15:28 +0100)]
JAL-3287 adjustment to HelpLinksChecker to run in Windows and improvement to build.gradle
Ben Soares [Fri, 31 May 2019 14:44:07 +0000 (15:44 +0100)]
JAL-3247 Adjusted Uninstall Old Jalview.app to just run the old uninstaller if it finds it, aded '(optional)' to the link name in the DMG. It will need re-signing. Edited VCFReader to allow java 1.8 compiling.
gmungoc [Wed, 29 May 2019 15:17:10 +0000 (16:17 +0100)]
JAL-2738 error logging if no ##reference found
gmungoc [Wed, 29 May 2019 15:13:10 +0000 (16:13 +0100)]
JAL-2738 accept .csi, default to GRCh37:homo_sapiens if no ##reference
Ben Soares [Tue, 28 May 2019 23:28:58 +0000 (00:28 +0100)]
JAL-3277 Fixed getdown splashscreen. For unknown reasons getdown thought it had both ui.background_image and ui.rotating_background and so defaulted to using ui.rotating_background even though this was not provided. Changed it to default to ui.background_image.
Ben Soares [Tue, 28 May 2019 15:25:49 +0000 (16:25 +0100)]
JAL-1988 Some TEST code accidentally left in now removed -- was affecting some saved alignment files such as stk
Jalview Development Admin [Tue, 28 May 2019 12:42:37 +0000 (13:42 +0100)]
JAL-3247 sign the AppleScript uninstaller
Ben Soares [Tue, 28 May 2019 11:18:24 +0000 (12:18 +0100)]
JAL-3141 deleted TODO comment in Messages_es
Ben Soares [Tue, 28 May 2019 11:14:51 +0000 (12:14 +0100)]
Merge branch 'develop' into task/JAL-3141_JAL-3247_merge
updating merge
Ben Soares [Mon, 27 May 2019 15:26:45 +0000 (16:26 +0100)]
JAL-3141 Added HashMap types for Java 1.8 compatibility
Ben Soares [Mon, 27 May 2019 15:18:37 +0000 (16:18 +0100)]
Merge branch 'task/JAL-3141_Customise_checkbox' into task/JAL-3141_JAL-3247_merge
Ben Soares [Mon, 27 May 2019 15:18:09 +0000 (16:18 +0100)]
JAL-3141 Object array cast missing
Ben Soares [Mon, 27 May 2019 15:06:02 +0000 (16:06 +0100)]
Merge branch 'task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge' into task/JAL-3141_JAL-3247_merge
merge attempt
Ben Soares [Mon, 27 May 2019 14:50:52 +0000 (15:50 +0100)]
Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge
Merging in develop
Ben Soares [Mon, 27 May 2019 14:50:37 +0000 (15:50 +0100)]
JAL-3247 Added AppleScript based App to run old Jalview uninstaller if present
Ben Soares [Mon, 27 May 2019 09:01:12 +0000 (10:01 +0100)]
JAL-3141 Generified the JvUtils.buildComboWithTooltips to an Object and adjusted other code in FeatureTypeSettings. Added one more tooltip.
gmungoc [Mon, 27 May 2019 08:16:25 +0000 (09:16 +0100)]
JAL-3141 test file in test folder not examples
Ben Soares [Sat, 25 May 2019 13:44:00 +0000 (14:44 +0100)]
JAL-3141 One more error log fix
Ben Soares [Sat, 25 May 2019 13:40:48 +0000 (14:40 +0100)]
JAL-3141 Added tooltips on Schemes dropdown and Customise checkbox
Ben Soares [Fri, 24 May 2019 16:35:41 +0000 (17:35 +0100)]
JAL-3141 Fixes recommended from gmc's test
gmungoc [Fri, 24 May 2019 13:31:57 +0000 (14:31 +0100)]
JAL-1988 Spanish typo corrección
Ben Soares [Fri, 24 May 2019 11:32:43 +0000 (12:32 +0100)]
JAL-3141 Fixed vertical size of the example filenames box\! Yay\!
Ben Soares [Fri, 24 May 2019 09:05:10 +0000 (10:05 +0100)]
JAL-3141 Fixed tests
Ben Soares [Fri, 24 May 2019 01:24:18 +0000 (02:24 +0100)]
JAL-3141 Reworked a lot of BackupFiles to allow the Customise Checkbox
Ben Soares [Wed, 22 May 2019 11:18:01 +0000 (12:18 +0100)]
Merge branch 'bug/JAL-3141_backupfiles_prefs_widget_disable_bug' into merge/develop_backupfilefix/JAL-3141_remove_saveproject_and_fix_buglet
Merging three unmerged commits
gmungoc [Wed, 22 May 2019 08:41:41 +0000 (09:41 +0100)]
JAL-3111 help file spelling correction
Ben Soares [Tue, 21 May 2019 17:15:53 +0000 (18:15 +0100)]
JAL-3247 Launcher start improvements. RPM and DEB no longer packaged with getdown (due to difficulties)
gmungoc [Tue, 21 May 2019 16:45:40 +0000 (17:45 +0100)]
JAL-3273 small correction to expected result calculation
Ben Soares [Mon, 20 May 2019 22:03:23 +0000 (23:03 +0100)]
Merge branch 'task/JAL-3254_improved_max_memory_stack_setting' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge
Merging a number of fixes/improvements into one branch and then merge in develop
Ben Soares [Mon, 20 May 2019 15:33:04 +0000 (16:33 +0100)]
JAL-3247 Unix shell installer and tar archive corrected -- network and offline versions. RPM and DEB have had JRE dependencies added (not tested yet)
Ben Soares [Mon, 20 May 2019 14:15:19 +0000 (15:15 +0100)]
JAL-3254 Improved memory setting (allows mem for OS). Moved OperatingSystemMXBean stuff to separate class. Class duplicated in getdown for same Memory Per Centage calculation.
Jim Procter [Mon, 13 May 2019 15:53:08 +0000 (16:53 +0100)]
Merge branch 'task/JAL-3247_Install4j_improvements' into develop
Ben Soares [Mon, 13 May 2019 15:01:14 +0000 (16:01 +0100)]
Merge branch 'task/JAL-3236_install4j_linux_unix_userland_installers' into task/JAL-3247_Install4j_improvements
Ben Soares [Mon, 13 May 2019 14:51:15 +0000 (15:51 +0100)]
JAL-3247 nogradle option on this mac build/install helper script
Ben Soares [Mon, 13 May 2019 14:17:24 +0000 (15:17 +0100)]
JAL-3247 JAL-3254 JAL-3260 Fixed: JVL file jalview.apparg args. File association problem in Windows NETWORK installer.
Jim Procter [Fri, 10 May 2019 16:41:37 +0000 (17:41 +0100)]
Merge branch 'task/JAL-3246_local_getdown_files' into develop
Ben Soares [Fri, 10 May 2019 16:39:24 +0000 (17:39 +0100)]
JAL-3246 JAL-3247 Reworked JVL files as getdown.txt config with limitations
Jim Procter [Fri, 10 May 2019 16:21:16 +0000 (17:21 +0100)]
Merge branch 'task/JAL-3236_install4j_linux_unix_userland_installers' into develop
Ben Soares [Thu, 9 May 2019 19:14:13 +0000 (20:14 +0100)]
JAL-3236 Added unixInstaller to install4jMediaTypes in gradle.properties
Jim Procter [Thu, 9 May 2019 16:19:45 +0000 (17:19 +0100)]
Merge branch 'task/JAL-3246_local_getdown_files' into develop
Ben Soares [Thu, 9 May 2019 16:04:06 +0000 (17:04 +0100)]
JAL-3247 JAL-3254 Ensure .jvp and .jvl appear first in File Associations list (visible in Windows installer)
Ben Soares [Thu, 9 May 2019 16:03:12 +0000 (17:03 +0100)]
JAL-3247 JAL-3254 Fixed file association launch behaviour in getdown in Windows
Ben Soares [Wed, 8 May 2019 17:25:06 +0000 (18:25 +0100)]
JAL-3246 add -Pgetdown_local=true to use local files
Ben Soares [Wed, 8 May 2019 16:35:31 +0000 (17:35 +0100)]
JAL-3247 JAL-3254 changing default location of jalview/io/FileFormat.java relative to the util/install4j dir
Ben Soares [Wed, 8 May 2019 16:33:45 +0000 (17:33 +0100)]
JAL-3247 JAL-3254 Getdown now opening any files thrown at it by a file-association double-click
Ben Soares [Wed, 8 May 2019 16:18:22 +0000 (17:18 +0100)]
JAL-3247 JAL-3254 Automatically creating correct file association inserts for Info.plist and install4j installer
Ben Soares [Wed, 8 May 2019 16:17:05 +0000 (17:17 +0100)]
JAL-3247 JAL-3254 Automatically creating correct file association inserts for Info.plist and install4j installer
Ben Soares [Wed, 8 May 2019 12:43:33 +0000 (13:43 +0100)]
JAL-3247 Script to produce auto file association files for mac and windows installer, and changes in build.gradle to read in the produced, and edited, auto files
Ben Soares [Wed, 8 May 2019 10:57:57 +0000 (11:57 +0100)]
JAL-3247 Note in launcher.log when using a JVL file
Ben Soares [Tue, 7 May 2019 23:05:44 +0000 (00:05 +0100)]
JAL-3247 Changed JVL file to be a props file, with appbase=... required for the new appbase URL
Ben Soares [Tue, 7 May 2019 21:49:38 +0000 (22:49 +0100)]
JAL-3247 Script to automatically install Jalview from the .dmg to /Applications
Ben Soares [Tue, 7 May 2019 19:17:48 +0000 (20:17 +0100)]
JAL-3247 Auto generated file associations from jalview/io/FileFormat.java
Ben Soares [Mon, 6 May 2019 23:38:52 +0000 (00:38 +0100)]
JAL-3247 Allowing 'file' protocol URL with empty domain in a .jvl file
Ben Soares [Mon, 6 May 2019 16:06:29 +0000 (17:06 +0100)]
JAL-3247 Code changes to getdown. Double click open of .jvp files in Windows and macOS, and .jvl new appbase file working in macOS.
Ben Soares [Mon, 6 May 2019 13:54:23 +0000 (14:54 +0100)]
JAL-3247 improvements
Ben Soares [Mon, 6 May 2019 12:56:31 +0000 (13:56 +0100)]
JAL-3247 Some getdown image file changes/tidying
gmungoc [Mon, 6 May 2019 08:49:45 +0000 (09:49 +0100)]
JAL-3240 known issue for release notes
gmungoc [Mon, 6 May 2019 08:23:18 +0000 (09:23 +0100)]
JAL-3239 release note
gmungoc [Mon, 6 May 2019 08:21:40 +0000 (09:21 +0100)]
JAL-3244 release note
gmungoc [Mon, 6 May 2019 08:18:52 +0000 (09:18 +0100)]
Merge remote-tracking branch 'origin/bug/JAL-3239monospacedEps' into develop
gmungoc [Mon, 6 May 2019 08:07:53 +0000 (09:07 +0100)]
JAL-3244 delete obsolete method
Ben Soares [Fri, 3 May 2019 23:03:55 +0000 (00:03 +0100)]
JAL-3247 First attempt at getdown code to add macOS startup filenames to the appargs as -open filename
Ben Soares [Fri, 3 May 2019 19:28:56 +0000 (20:28 +0100)]
JAL-3247 Part way towards adding double-click opening in Jalview on .jvp file in macOS
Ben Soares [Thu, 2 May 2019 15:55:57 +0000 (16:55 +0100)]
JAL-3247 Improved file associations on macOS and Windows
gmungoc [Thu, 2 May 2019 13:37:13 +0000 (14:37 +0100)]
JAL-3239 draw EPS or SVG one character at a time (even monospaced)
gmungoc [Thu, 2 May 2019 11:36:32 +0000 (12:36 +0100)]
Merge branch 'bug/JAL-3244jmolWindows' into develop
gmungoc [Thu, 2 May 2019 11:34:40 +0000 (12:34 +0100)]
JAL-3244 renamed Platform method for clarity
Ben Soares [Thu, 2 May 2019 11:17:24 +0000 (12:17 +0100)]
adding another getdown file (produced during a getdown build) to gitignore
Ben Soares [Thu, 2 May 2019 11:11:09 +0000 (12:11 +0100)]
JAL-3247 jvp jvl File associations, JRE variablised, Windows-Userspace path default
Ben Soares [Wed, 1 May 2019 16:36:52 +0000 (17:36 +0100)]
Fixed -Djvl=true in install4j JVM invocation
Ben Soares [Wed, 1 May 2019 16:18:03 +0000 (17:18 +0100)]
Extra JVL file association in the installer. Shadowed gradle-launcher.jar and classpath adjusted in install4j template. 'jre' folder made a compiler variable in install4j template.
gmungoc [Wed, 1 May 2019 16:04:16 +0000 (17:04 +0100)]
JAL-3244 ignore file path separator when comparing pdb file paths
Ben Soares [Wed, 1 May 2019 13:37:45 +0000 (14:37 +0100)]
Merge branch 'task/JAL-3243_PDB_free_text_error' into develop
Merging in JAL-3243 replacement .jar files for jersey and javax.ws.rs.
Ben Soares [Tue, 30 Apr 2019 17:05:49 +0000 (18:05 +0100)]
JAL-3243 Replaced javax.ws jar compatible with jersey-*-1.19.1.jar
Ben Soares [Tue, 30 Apr 2019 11:51:16 +0000 (12:51 +0100)]
JAL-3196 Correcting the source for getdown (already corrected in util/install4j/install4j_template.install4j and getdown/lib/getdown-launcher.jar)
gmungoc [Tue, 30 Apr 2019 10:57:49 +0000 (11:57 +0100)]
JAL-3241 simplified enum constructors for classloadability in Java 11
gmungoc [Mon, 29 Apr 2019 14:17:45 +0000 (15:17 +0100)]
JAL-2738 JAL-2743 update unit test to match new VCF properties
gmungoc [Mon, 29 Apr 2019 13:47:30 +0000 (14:47 +0100)]
JAL-3003 help page mention EPS doesn't support transparency
Jim Procter [Fri, 26 Apr 2019 16:47:35 +0000 (17:47 +0100)]
JAL-3236 see also previous commit - tweak the install4j template so our installers get built !
Ben Soares [Fri, 26 Apr 2019 16:25:20 +0000 (17:25 +0100)]
Added a unixInstaller and unixArchive media-type to the install4j template. unixArchive is now specified in the gradle.properties (unixInstaller can be added).
Ben Soares [Fri, 26 Apr 2019 15:23:55 +0000 (16:23 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
Ben Soares [Fri, 26 Apr 2019 15:22:53 +0000 (16:22 +0100)]
Removing old commented out 'org.gradle.java.home=' line from gradle.properties
Jim Procter [Fri, 26 Apr 2019 14:11:47 +0000 (15:11 +0100)]
Merge branch 'develop' of source.jalview.org/git/jalview into develop
gmungoc [Fri, 26 Apr 2019 13:55:07 +0000 (14:55 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
gmungoc [Fri, 26 Apr 2019 13:53:42 +0000 (14:53 +0100)]
JAL-2743 class Javadoc
gmungoc [Fri, 26 Apr 2019 13:52:30 +0000 (14:52 +0100)]
JAL-2738 JAL-2743 properties to map VCF header to species or assembly
Ben Soares [Fri, 26 Apr 2019 13:13:13 +0000 (14:13 +0100)]
Also removing eclipse .project and .settings from the branch. Run 'gradle cleanEclipse eclipse' to produce fresh new eclipse project files (and either 'Refresh' project in eclipse, or 'Import... -> Existing gradle project') or just run 'gradle eclipse' to keep some of your existing project settings.
Ben Soares [Fri, 26 Apr 2019 12:20:49 +0000 (13:20 +0100)]
Removing .classpath from this branch
Jim Procter [Fri, 26 Apr 2019 11:34:30 +0000 (12:34 +0100)]
JAL-3150 examples/exampleFile.jvp for updated manual/tutorial exercises
Ben Soares [Fri, 26 Apr 2019 10:59:34 +0000 (11:59 +0100)]
JAL-3233 Added isAMac check for -Xdock:icon addition to Launcher command. Added a process.waitFor() so Launcher doesn't background Jalview
gmungoc [Fri, 26 Apr 2019 09:17:09 +0000 (10:17 +0100)]
JAL-3010 borderless 'x' for "delete this filter condition"
Conflicts:
src/jalview/gui/FeatureTypeSettings.java
gmungoc [Fri, 26 Apr 2019 09:41:33 +0000 (10:41 +0100)]
JAL-2808 better tooltip 'delete this condition'
Jalview Build Box [Thu, 25 Apr 2019 17:29:13 +0000 (18:29 +0100)]
JAL-3234 tidy up stdout on build
Jalview Build Box [Thu, 25 Apr 2019 17:26:31 +0000 (18:26 +0100)]
JAL-3234 allow gradle builds to run without having to specify keysigning variables by rewriting install4j flags
Jalview Build Box [Thu, 25 Apr 2019 16:50:53 +0000 (17:50 +0100)]
Merge branch 'task/JAL-3234_211_codesigning' into develop
JAL-3225 JAL-3196 JAL-3179 JAL-3227 JAL-3228 JAL-3229 JAL-3007 JAL-3111 Jalview 2.11 gradle/Java 11 build is now main develop branch
Jalview Build Box [Thu, 25 Apr 2019 16:49:57 +0000 (17:49 +0100)]
Merge branch 'bug/JAL-3224_getdown_changed_to_unpack_tgz_resources' into task/JAL-3234_211_codesigning
Ben Soares [Thu, 25 Apr 2019 16:25:50 +0000 (17:25 +0100)]
JAL-3224 JAL-3225 Fixed help image mangling, moved help to help/help and added this in to eclipse classpath generation