Ben Soares [Wed, 5 Jun 2024 14:03:52 +0000 (15:03 +0100)]
Merge branch 'develop' into bug/JAL-4421_customise_volume_name_of_DMG_installers
Ben Soares [Wed, 5 Jun 2024 13:17:38 +0000 (14:17 +0100)]
JAL-4421 Downgrading ds_store to 1.3.0 for build server limitations
Ben Soares [Wed, 5 Jun 2024 00:28:20 +0000 (01:28 +0100)]
JAL-4421 Configuration for positioning icons in DMG
Ben Soares [Wed, 5 Jun 2024 00:27:24 +0000 (01:27 +0100)]
JAL-4421 Add --appname --appxpos --appypos to position variable application name icons, or read from config[app]
Ben Soares [Tue, 4 Jun 2024 20:39:55 +0000 (21:39 +0100)]
JAL-4421 Remove the disk_image_alias from the backgroundImageAlias altogether as it isn't needed and doesn't even make sense for a downloaded DMG
Ben Soares [Tue, 4 Jun 2024 17:35:53 +0000 (18:35 +0100)]
JAL-4421 Allow JSON config file to be options (no icon positioning for default or develop-SUFFIX). Allow .VolumeIcons.icns to be optional -- must remove <file> node from install4j template
Jim Procter [Tue, 4 Jun 2024 15:35:40 +0000 (16:35 +0100)]
JAL-4418 first development release for 2.11.4.0 - release notes for
JAL-4159,JAL-4257,JAL-4386,JAL-4392,JAL-789
Jim Procter [Tue, 4 Jun 2024 15:08:26 +0000 (16:08 +0100)]
Merge branch 'feature/JAL-4159_pasimap' into develop
Conflicts:
help/markdown/releases/release-2_11_3_0.md
Jim Procter [Tue, 4 Jun 2024 15:05:57 +0000 (16:05 +0100)]
Merge branch 'releases/Release_2_11_3_Branch' into develop
Ben Soares [Tue, 4 Jun 2024 00:50:02 +0000 (01:50 +0100)]
JAL-4421 Put correct VolumeIcon.icns file onto DMG volume as /.VolumeIcon.icns
Ben Soares [Mon, 3 Jun 2024 23:50:05 +0000 (00:50 +0100)]
JAL-4421 Icns to use as .VolumeIcon.icns in DMG volumes. See comment with SetFile
Ben Soares [Mon, 3 Jun 2024 18:13:40 +0000 (19:13 +0100)]
JAL-4421 Also add DMG filename to python script. Necessitates DS_Store for x64 and aarch64 versions, with changes in build.gradle and install4j10_template.install4j. Ensure all x64 references are x64 and not the (more correct) x86 -- java uses x64.
Ben Soares [Fri, 31 May 2024 23:45:58 +0000 (00:45 +0100)]
JAL-4421 Add DS_Store customisation to gradle. Add backgroundImage alias dump to --dump
Ben Soares [Fri, 31 May 2024 17:48:47 +0000 (18:48 +0100)]
JAL-4421 Python script for customising DS_Store. Separate out more names for DMG volumes in install4j and gradle. Channel specific icon positioning for channel specific DMG background images.
Ben Soares [Wed, 29 May 2024 15:25:34 +0000 (16:25 +0100)]
JAL-4409 Allow more URI schemes (e.g. file) to be opened in Jalview
Ben Soares [Wed, 29 May 2024 15:11:38 +0000 (16:11 +0100)]
JAL-4409 Allow more URI schemes (e.g. file) to filter through to Jalview
Ben Soares [Wed, 29 May 2024 12:08:09 +0000 (13:08 +0100)]
JAL-4414 Add SocketTimeoutException to exceptions that trigger File Not Found rather than Format Not Recognised
Ben Soares [Wed, 29 May 2024 11:58:57 +0000 (12:58 +0100)]
JAL-3196 Need more memory for the install4j process run by gradle
Ben Soares [Tue, 28 May 2024 21:14:17 +0000 (22:14 +0100)]
JAL-4409 JAL-4160 Don't let getdown turn jalviewX:// URIs into absolute local file paths. Allow getdown CLI memory setting with double-dash --jvmmemX
Ben Soares [Tue, 28 May 2024 14:33:54 +0000 (15:33 +0100)]
JAL-4417 Use a specified props file for consistent output
Ben Soares [Tue, 28 May 2024 13:40:03 +0000 (14:40 +0100)]
JAL-4409 TEMPORARY don't clean up image files from jalview.bin.CommandsTest.headlessOrGuiImageOutputTest failing on build server
Ben Soares [Tue, 28 May 2024 12:21:24 +0000 (13:21 +0100)]
JAL-4409 Ensure the specific scheme jalviewx is only for the release version
Ben Soares [Tue, 28 May 2024 12:03:31 +0000 (13:03 +0100)]
JAL-4409 Don't insist on HttpURLConnection, allows for file:/ protocol connection
Ben Soares [Mon, 27 May 2024 09:06:01 +0000 (10:06 +0100)]
Merge branch 'develop' into improvement/JAL-4409_implement_extra_schemes_in_getdown
Jim Procter [Fri, 24 May 2024 15:43:42 +0000 (16:43 +0100)]
JAL-4159 fix up test for applicable filters for pasimap
Jim Procter [Fri, 24 May 2024 15:36:37 +0000 (16:36 +0100)]
JAL-4159 fix PairwiseAlignmentPanelTest - reinstate correct recording of the endRes for each sequence aligned
Jim Procter [Fri, 24 May 2024 15:18:49 +0000 (16:18 +0100)]
JAL-4159 peek in a Jalview project's PCA viewer's title to decide if it is a "pasimap" viewer or some other Pcaviewer...
Jim Procter [Fri, 24 May 2024 14:25:07 +0000 (15:25 +0100)]
JAL-4257 JAL-4159 JAL-789 tidy up passing of score model to pairwise alignment directly/via pasimap and threading off the direct pairwise alignment calculation
James Procter [Sat, 16 Dec 2023 08:43:06 +0000 (08:43 +0000)]
JAL-789 pairwise alignment via calculations dialog, allowing score model to be changed
merged in with feature/JAL-4159_pasimap
James Procter [Fri, 15 Dec 2023 13:56:07 +0000 (13:56 +0000)]
JAL-4366 compute coverage on each side of the pairwise alignment
Jim Procter [Fri, 24 May 2024 11:32:48 +0000 (12:32 +0100)]
Merge branch 'jims/feature/JAL-4159_pasimap' into feature/JAL-4159_pasimap
Jim Procter [Fri, 24 May 2024 11:24:17 +0000 (12:24 +0100)]
Merge branch 'features/JAL-4257_adjustablegapparams_nw' into jims/feature/JAL-4159_pasimap
Jim Procter [Thu, 23 May 2024 17:18:39 +0000 (18:18 +0100)]
JAL-4159 fix sense of console/alignment output suppression flags and make sure all output is suppressed when computing pairwise alignments
Jim Procter [Thu, 23 May 2024 17:17:12 +0000 (18:17 +0100)]
JAL-4159 disable the score model combo box when pasimap is selected
MorellThomas [Thu, 23 May 2024 12:53:51 +0000 (14:53 +0200)]
mend
MorellThomas [Thu, 23 May 2024 12:50:03 +0000 (14:50 +0200)]
Fix PaSiMap taking scoreModels input and allow AlignSeq/PairwiseAlignPanel to take a ScoreMatrix
MorellThomas [Thu, 23 May 2024 08:19:42 +0000 (10:19 +0200)]
Fix PaSiMap not having the eigenvalues saved
MorellThomas [Wed, 22 May 2024 13:53:35 +0000 (15:53 +0200)]
revert build.gradle changes
MorellThomas [Wed, 22 May 2024 13:46:48 +0000 (15:46 +0200)]
Save PaSiMap with Jalview Session
MorellThomas [Wed, 22 May 2024 11:36:07 +0000 (13:36 +0200)]
Rectanuglar selection changed to Mouse Button 3 drag
Jim Procter [Tue, 21 May 2024 17:29:24 +0000 (18:29 +0100)]
JAL-4259 set title using original alignment window's title
Jim Procter [Tue, 21 May 2024 17:21:05 +0000 (18:21 +0100)]
JAL-4159 implement bounds for PASIMAP calculation - from 9 to 20000 sequences.
Jim Procter [Tue, 21 May 2024 17:18:20 +0000 (18:18 +0100)]
JAL-4159 connectivity should be computed for the sequences analysed with PAsiMap, not the alignment
Jim Procter [Tue, 21 May 2024 17:16:59 +0000 (18:16 +0100)]
JAL-4159 PASiMap currently doesn't support different score models
Jim Procter [Tue, 21 May 2024 17:15:11 +0000 (18:15 +0100)]
JAL-4159 sometimes the progress bar may not be available - null check
Ben Soares [Tue, 21 May 2024 17:02:14 +0000 (18:02 +0100)]
JAL-1054 Change one more (unused) url.openStream to use the HttpUtils wrapper for completeness
Ben Soares [Tue, 21 May 2024 16:56:44 +0000 (17:56 +0100)]
JAL-1054 Change the rest of the url.openConnection() calls to use the HttpUtils.openConnection(url) wrapper
Ben Soares [Tue, 21 May 2024 15:31:00 +0000 (16:31 +0100)]
JAL-4409 Adjust usage of HttpUtils.equivalentJalviewURLString() and pass jalviewX:// URL files to Jalview without changing them as Jalview now deals with them
Ben Soares [Tue, 21 May 2024 14:55:57 +0000 (15:55 +0100)]
JAL-4409 Make HttpUtils.equivalentJalviewUrlString 'non-destructive'
Jim Procter [Tue, 21 May 2024 14:46:05 +0000 (15:46 +0100)]
Merge branch 'feature/JAL-4159_pasimap' into spike/JAL-4159_pasimap_2113_series
loop in new progress bar and resolve formatting conflicts in PairwiseAlignPanel
Jim Procter [Tue, 21 May 2024 14:19:13 +0000 (15:19 +0100)]
JAL-4356 release date for 2.11.3.3 is 22nd May 2025
Jim Procter [Tue, 21 May 2024 14:19:13 +0000 (15:19 +0100)]
JAL-4356 release date for 2.11.3.3 is 22nd May 2025
Ben Soares [Mon, 20 May 2024 20:19:21 +0000 (21:19 +0100)]
JAL-4409 Also interpret jalviewX:// URIs in Jalview itself (for executable jar or command line start)
Ben Soares [Mon, 20 May 2024 20:11:02 +0000 (21:11 +0100)]
JAL-4397 Another fix on linux
Ben Soares [Fri, 17 May 2024 16:26:30 +0000 (17:26 +0100)]
JAL-4420 Add some debugging statements
Ben Soares [Fri, 17 May 2024 14:56:11 +0000 (15:56 +0100)]
JAL-4420 Tests for new FileUtils methods
Ben Soares [Fri, 17 May 2024 14:55:52 +0000 (15:55 +0100)]
JAL-4420 Allow preprocessing of arguments if they are all simply filenames (or URLs). Preprocessing involves adding --open arguments, and spotting and regrouping associated files such as annotations, features and tree files. These get --annotations argument etc. Add FileUtils tools to get basepath and extension of filename or URL whilst only in String form.
Ben Soares [Fri, 17 May 2024 14:11:48 +0000 (15:11 +0100)]
JAL-4409 Checking getdown jars up to date
Ben Soares [Fri, 17 May 2024 13:48:01 +0000 (14:48 +0100)]
JAL-3409 Add newline back into Buffered Reader in getdown launcher.log
Ben Soares [Fri, 17 May 2024 09:03:30 +0000 (10:03 +0100)]
JAL-4409 corrected the umount of dmg to hdiutil detach to allow subsequent opening with other improvements
Ben Soares [Thu, 16 May 2024 23:57:29 +0000 (00:57 +0100)]
JAL-4409 Added remote JVL files for Linux/Windows
Ben Soares [Thu, 16 May 2024 19:01:01 +0000 (20:01 +0100)]
JAL-4409 Added multiple file open to getdown. Added URL source of JVL file ability to getdown. Convert jalviewX:// type schemed URIs consistently.
Jim Procter [Thu, 16 May 2024 14:13:40 +0000 (15:13 +0100)]
JAL-4356 release notes for JAL-3978 patch
Jim Procter [Thu, 16 May 2024 14:13:40 +0000 (15:13 +0100)]
JAL-4356 release notes for JAL-3978 patch
Ben Soares [Thu, 16 May 2024 13:59:17 +0000 (14:59 +0100)]
JAL-3978 Add the bin dir to be copied from website appdir to archive appdir
Jim Procter [Thu, 16 May 2024 14:09:54 +0000 (15:09 +0100)]
Merge branch 'bug/JAL-3978_copy_bin_dir_to_getdownArchiveBuild_task' into develop
Ben Soares [Thu, 16 May 2024 13:59:17 +0000 (14:59 +0100)]
JAL-3978 Add the bin dir to be copied from website appdir to archive appdir
Ben Soares [Thu, 16 May 2024 13:44:36 +0000 (14:44 +0100)]
JAL-4409 Easier full install from source for macOS
Ben Soares [Thu, 16 May 2024 13:44:04 +0000 (14:44 +0100)]
JAL-4409 more places to check for jalviewd://
Jim Procter [Thu, 16 May 2024 07:31:29 +0000 (08:31 +0100)]
JAL-4418 bump release to 2.11.4.0
Jim Procter [Thu, 16 May 2024 07:07:17 +0000 (08:07 +0100)]
Merge branch 'develop' into feature/JAL-4159_pasimap
doesn't seem to have apache-math present
Conflicts:
build.gradle
Jim Procter [Thu, 16 May 2024 06:54:13 +0000 (07:54 +0100)]
Merge branch 'feature/JAL-4386_calculate_tree_using_secondary_structure_annotation' into develop
Jim Procter [Thu, 16 May 2024 06:53:50 +0000 (07:53 +0100)]
Merge branch 'develop' into feature/JAL-4386_calculate_tree_using_secondary_structure_annotation
Jim Procter [Thu, 16 May 2024 06:52:28 +0000 (07:52 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
Jim Procter [Thu, 16 May 2024 06:52:10 +0000 (07:52 +0100)]
JAL-4356 bump release date to today, release notes for patching JAL-4407 and known issue report for JAL-3124 and JAL-4415
Ben Soares [Wed, 15 May 2024 17:27:07 +0000 (18:27 +0100)]
JAL-4397 IdWidth tests slightly less restrictive for platform/scaling variations
Ben Soares [Wed, 15 May 2024 16:59:45 +0000 (17:59 +0100)]
JAL-4409 extra schemes now opening correctly in macos
Renia Correya [Wed, 15 May 2024 16:30:44 +0000 (17:30 +0100)]
JAL-4386 Fixed failed test case
Jim Procter [Wed, 15 May 2024 16:15:05 +0000 (17:15 +0100)]
Merge branch 'bug/JAL-4416_sview_not_shown_for_local_strucfile' into develop
Renia Correya [Wed, 15 May 2024 15:56:22 +0000 (16:56 +0100)]
JAL-4386 Fixed failed test cases
Jim Procter [Wed, 15 May 2024 15:54:47 +0000 (16:54 +0100)]
JAL-4416 TODO for fixing JAL-4415 JAL-3124 - need a test for this
Jim Procter [Wed, 15 May 2024 15:53:18 +0000 (16:53 +0100)]
JAL-4416 ensure the structure view is shown and any added annotation is displayed
Jim Procter [Wed, 15 May 2024 15:44:23 +0000 (16:44 +0100)]
JAL-4416 make sure the structure viewer is actually opened when handling local file view
Renia Correya [Wed, 15 May 2024 15:37:39 +0000 (16:37 +0100)]
JAL-4386 Added preferences for secondary structure consensus and it is
set as false by default to skip failed test cases.
Ben Soares [Wed, 15 May 2024 15:23:43 +0000 (16:23 +0100)]
JAL-4409 minor change for mac testing
Ben Soares [Wed, 15 May 2024 14:48:41 +0000 (15:48 +0100)]
JAL-4409 Updated getdown classes
Ben Soares [Wed, 15 May 2024 14:48:14 +0000 (15:48 +0100)]
JAL-4409 Refactoring to allow easier reuse of classes with getdown
Jim Procter [Wed, 15 May 2024 13:28:59 +0000 (14:28 +0100)]
Merge branch 'bug/JAL-4407_no_sec_str_from_draganddrop_to_msa' into develop
Renia Correya [Wed, 15 May 2024 09:58:52 +0000 (10:58 +0100)]
JAL-4386 - Implementation of retrieving secondary structure
source/provider from matching the annotation description and PDB entry.
Implementation of Show secondary structure menu option. Updated
calculation of secondary structure consensus.
Ben Soares [Tue, 14 May 2024 20:09:38 +0000 (21:09 +0100)]
JAL-1054 JAL-4414 Tests for the HttpUtils redirect wrapper methods. Tests for the different exceptions from IdentityFile.identify().
Ben Soares [Tue, 14 May 2024 20:07:09 +0000 (21:07 +0100)]
JAL-1054 Also recognise UnknownHostException as a file not found at URL
Ben Soares [Tue, 14 May 2024 16:57:01 +0000 (17:57 +0100)]
Merge branch 'develop' into improvement/JAL-4409_implement_extra_schemes_in_getdown
Ben Soares [Tue, 14 May 2024 16:38:54 +0000 (17:38 +0100)]
JAL-4217 Upped the main testTask0 timeout to 15 minutes for build server's benefit
Ben Soares [Tue, 14 May 2024 16:37:49 +0000 (17:37 +0100)]
JAL-1054 Tests for the HttpUtils redirection wrappers
Ben Soares [Tue, 14 May 2024 14:44:49 +0000 (15:44 +0100)]
Merge branch 'bug/JAL-4397_failing_idWidth_tests' into improvement/JAL-4409_implement_extra_schemes_in_getdown
Ben Soares [Tue, 14 May 2024 14:27:28 +0000 (15:27 +0100)]
Merge branch 'develop' into bug/JAL-4397_failing_idWidth_tests
Ben Soares [Tue, 14 May 2024 14:26:51 +0000 (15:26 +0100)]
JAL-4414 Add a FileNotFoundException when identifying URL file formats and catch to change error message appropriately
Jim Procter [Tue, 14 May 2024 13:41:22 +0000 (14:41 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch
Jim Procter [Tue, 14 May 2024 13:41:03 +0000 (14:41 +0100)]
JAL-4356 fix release note
Jim Procter [Tue, 14 May 2024 13:27:08 +0000 (14:27 +0100)]
Merge branch 'develop' into releases/Release_2_11_3_Branch