Jim Procter [Mon, 13 Sep 2021 16:22:20 +0000 (17:22 +0100)]
Merge branch 'releases/Release_2_11_2_Branch' into develop
Jim Procter [Mon, 13 Sep 2021 16:22:10 +0000 (17:22 +0100)]
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
Jim Procter [Mon, 13 Sep 2021 16:19:18 +0000 (17:19 +0100)]
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into releases/Release_2_11_2_Branch
Jim Procter [Mon, 13 Sep 2021 16:04:22 +0000 (17:04 +0100)]
JAL-3829 ensure unmock the FTS PDB and TDB clients after mocking for a test
Jim Procter [Mon, 13 Sep 2021 15:02:25 +0000 (16:02 +0100)]
JAL-3829 minimal test of additional TDB filters - not at all robust
Jim Procter [Mon, 13 Sep 2021 15:02:02 +0000 (16:02 +0100)]
JAL-3829 select single best TDB structure and select structures from particular provider (this code is horrific !)
Jim Procter [Sun, 12 Sep 2021 14:53:39 +0000 (15:53 +0100)]
JAL-3829 JalviewJS workarounds/patches
Jim Procter [Sun, 12 Sep 2021 14:53:06 +0000 (15:53 +0100)]
JAL-3829 upgrade Jmol to 14.31.53, SwingJS-JSMol to 14.31.54 and SwingJS to 3.3.1
Jim Procter [Sat, 11 Sep 2021 11:10:40 +0000 (12:10 +0100)]
JAL-3829 ensure tests use mocked service - proper exception for mocked 400 response
Jim Procter [Sat, 11 Sep 2021 10:53:05 +0000 (11:53 +0100)]
JAL-3829 patch failing tests and todo for future
Jim Procter [Fri, 10 Sep 2021 14:06:56 +0000 (15:06 +0100)]
JAL-3829 provide both PDBe queries and 3D-Beacons queries in the filter combo box
Jim Procter [Fri, 10 Sep 2021 12:45:07 +0000 (13:45 +0100)]
JAL-3829 insert title for structures from PDBe
Jim Procter [Fri, 10 Sep 2021 12:44:30 +0000 (13:44 +0100)]
JAL-3829 update for v1.0 3d-beacons api spec
Jim Procter [Fri, 10 Sep 2021 12:42:57 +0000 (13:42 +0100)]
JAL-3829 point at production 3d-beacons url
Jim Procter [Wed, 8 Sep 2021 15:58:22 +0000 (16:58 +0100)]
JAL-3829 refactor and JAL-3391 JAL-2935 first stab at coverage based selection of models for a sequence
Jim Procter [Wed, 8 Sep 2021 12:33:20 +0000 (13:33 +0100)]
JAL-3829 allow client-side selection of structures for a sequence by passing in discovered structures
Jim Procter [Wed, 8 Sep 2021 12:31:05 +0000 (13:31 +0100)]
JAL-3829 JAL-3868 TODO
Jim Procter [Wed, 8 Sep 2021 11:37:00 +0000 (12:37 +0100)]
JAL-3829 formatting
Jim Procter [Wed, 8 Sep 2021 11:34:47 +0000 (12:34 +0100)]
JAL-3829 integration test verifying mock response is valid for a live server
Jim Procter [Mon, 6 Sep 2021 13:48:46 +0000 (14:48 +0100)]
JAL-3829 work in progress - look up additional metadata from PDBe for structures discovered via TDBFTS
Jim Procter [Mon, 6 Sep 2021 13:47:41 +0000 (14:47 +0100)]
JAL-3829 look up column in FTS data
Jim Procter [Mon, 6 Sep 2021 13:47:03 +0000 (14:47 +0100)]
JAL-3829 mocking for PDBFTS for related query to UniprotFTS mock.
Jim Procter [Mon, 6 Sep 2021 09:52:49 +0000 (10:52 +0100)]
JAL-3829 pull out structure chooser query source tests to new class
Jim Procter [Fri, 3 Sep 2021 17:47:53 +0000 (18:47 +0100)]
JAL-3829 JAL-3865 test structure chooser queries to mocked 3D Beacons FTS
Jim Procter [Fri, 3 Sep 2021 17:42:42 +0000 (18:42 +0100)]
JAL-3829 use sequence dependent constructor for structure chooser query engine testing
Jim Procter [Fri, 3 Sep 2021 17:41:32 +0000 (18:41 +0100)]
JAL-3829 mocking for testing 3D-Beacons FTS endpoint
Jim Procter [Fri, 3 Sep 2021 17:39:14 +0000 (18:39 +0100)]
JAL-3863 promote non-canonical version of dbref to a canonical one
Jim Procter [Fri, 3 Sep 2021 16:01:43 +0000 (17:01 +0100)]
JAL-3829 comments on the 3D structure chooser’s initialisation process
Jim Procter [Fri, 3 Sep 2021 16:01:04 +0000 (17:01 +0100)]
JAL-3865 isolate PDB and TDB clients and last query records in their query objects
Jim Procter [Fri, 3 Sep 2021 15:45:16 +0000 (16:45 +0100)]
JAL-3863 passing test to verify a uniprot accession with canonical flag set is transferred via the DBRefFetcher (and the SequenceI.transferAnnotation method it calls)
Jim Procter [Fri, 3 Sep 2021 14:37:29 +0000 (15:37 +0100)]
JAL-3829 JAL-3865 StructureChooserQuerySource implementation now dependent on the type of sequences and whether they have uniprot sequence IDs
Jim Procter [Fri, 3 Sep 2021 14:36:05 +0000 (15:36 +0100)]
JAL-3855 don’t need to query Alphafold2 repository directly from PDBe FTS client since 3db client will do that
Jim Procter [Fri, 3 Sep 2021 14:33:49 +0000 (15:33 +0100)]
JAL-3829 refactored FilterOption provider to the StructureChooserQuerySource implementation - implementation now is completely independent of GUI code.
Jim Procter [Thu, 2 Sep 2021 14:53:01 +0000 (15:53 +0100)]
Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
Jim Procter [Thu, 2 Sep 2021 14:34:48 +0000 (15:34 +0100)]
Merge branch 'cherry-pick/r2_11_2_JAL-3509' into develop
gmungoc [Thu, 6 Feb 2020 16:58:11 +0000 (16:58 +0000)]
JAL-1842 unit test updated for EnsemblGene feature settings changes
gmungoc [Thu, 6 Feb 2020 16:24:46 +0000 (16:24 +0000)]
JAL-1842 adjust code to match changed semantics of FeatureSettingsModelI
gmungoc [Thu, 6 Feb 2020 16:20:13 +0000 (16:20 +0000)]
JAL-3509 JAL-1842 minor tidying of code
gmungoc [Thu, 6 Feb 2020 15:32:36 +0000 (15:32 +0000)]
JAL-1842 remove redundant call to FeatureRenderer.featuresAdded()
gmungoc [Thu, 6 Feb 2020 15:21:30 +0000 (15:21 +0000)]
JAL-3509 better placement of call to notifyFeaturesChanged()
gmungoc [Thu, 6 Feb 2020 14:44:38 +0000 (14:44 +0000)]
JAL-3509 coerce RESNUM to hidden (really) after fetching from PDB - resolved conflicts for 2.11.2
Jim Procter [Mon, 30 Aug 2021 10:51:00 +0000 (11:51 +0100)]
JAL-3863 fix test and note about fragility
Jim Procter [Mon, 30 Aug 2021 10:14:29 +0000 (11:14 +0100)]
JAL-3863 add canonical DBRefEntry flag to Jalview project
Jim Procter [Mon, 30 Aug 2021 09:09:33 +0000 (10:09 +0100)]
JAL-3829 generalised Alphafold retrieval mechanism to be reused for PDBEntrys with retrieval URIs discovered via 3d beacons
Jim Procter [Mon, 30 Aug 2021 09:08:07 +0000 (10:08 +0100)]
JAL-3863 mark first accession retrieved from Uniprot as the canonical accession
Jim Procter [Mon, 30 Aug 2021 09:06:08 +0000 (10:06 +0100)]
JAL-3829 Structure chooser specific FTS interface and query source logic for PDBe and 3D-Beacons
Jim Procter [Thu, 26 Aug 2021 13:57:47 +0000 (14:57 +0100)]
Merge branch 'feature/JAL-3855_ebi_alphafold_import' (commit '
7856e91f60adc5c2d4943bad84a5a83e1412f00c') into features/r2_11_2_JAL-3929_3dbeacons
Jim Procter [Thu, 26 Aug 2021 13:56:05 +0000 (14:56 +0100)]
JAL-3829 3d-beacons structure chooser logic (not yet finished)
Jim Procter [Thu, 26 Aug 2021 10:14:16 +0000 (11:14 +0100)]
JAL-3829 pulled out more of the FTS dependent parts of structurechooser
Jim Procter [Wed, 25 Aug 2021 17:13:49 +0000 (18:13 +0100)]
JAL-3829 updated tests for 3db fetcher’s working FTS metadata
Jim Procter [Wed, 25 Aug 2021 17:10:50 +0000 (18:10 +0100)]
JAL-3829 proof in principle 3d-beacons sequence fetcher - still some TODOs !
Jim Procter [Wed, 25 Aug 2021 17:09:37 +0000 (18:09 +0100)]
JAL-3829 3d-beacons has a custom alignment retrieval model but re-uses the parseAlignment method from sequence fetcher
Jim Procter [Tue, 27 Jul 2021 13:26:09 +0000 (14:26 +0100)]
JAL-3674 Jmol seems to sometimes return a null for some commands, handle it at source
Jim Procter [Wed, 25 Aug 2021 15:26:00 +0000 (16:26 +0100)]
JAL-3829 fixed up the 3d-beacons data columns definitions, tests and client.
Jim Procter [Wed, 25 Aug 2021 15:25:05 +0000 (16:25 +0100)]
JAL-3829 JAL-2176 - TODO re unused argument in FTSRestClientI
Jim Procter [Wed, 25 Aug 2021 15:24:25 +0000 (16:24 +0100)]
JAL-3829 tidying up PDBFTSRestClient test responses - still one failing external test which expects to raise a server exception
Jim Procter [Mon, 23 Aug 2021 16:45:39 +0000 (17:45 +0100)]
JAL-3829 Javadoc for FTSColumnPreferences
Jim Procter [Mon, 23 Aug 2021 16:45:04 +0000 (17:45 +0100)]
JAL-3829 pushed the PDBFTSClient specific code to new ‘StructureChooserQuerySource’ class in preparation for adapting it to query 3d-beacons
Jim Procter [Mon, 23 Aug 2021 16:43:20 +0000 (17:43 +0100)]
JAL-3829 removed unneeded attribute in FTS core
arngucci [Mon, 7 Jun 2021 08:32:50 +0000 (10:32 +0200)]
JAL-3829_spike minor changes
arngucci [Mon, 12 Apr 2021 14:05:35 +0000 (16:05 +0200)]
JAL-3832 Gui working, with 3DBeacons parameters
arngucci [Mon, 12 Apr 2021 08:17:37 +0000 (10:17 +0200)]
Merge branch 'arnaud/develop' into arnaud/JAL-3929_spike, to insert the
previous changes
Jim Procter [Tue, 6 Apr 2021 14:23:51 +0000 (15:23 +0100)]
JAL-3829 forgot to add in the dummy 3d-beacons db proxy
Jim Procter [Tue, 27 Jul 2021 13:26:09 +0000 (14:26 +0100)]
JAL-3674 Jmol seems to sometimes return a null for some commands, handle it at source
Jim Procter [Tue, 27 Jul 2021 13:25:34 +0000 (14:25 +0100)]
JAL-3855 suppress NPE when trying to retrieve SIFTS mappings for Alphafold PDB IDs
Jim Procter [Tue, 27 Jul 2021 12:52:16 +0000 (13:52 +0100)]
JAL-3855 ALPHAFOLD database source based on the PDB retriever
Jim Procter [Tue, 27 Jul 2021 12:35:40 +0000 (13:35 +0100)]
JAL-3855 check if an alpha fold ID and retrieve using that source
Jim Procter [Tue, 27 Jul 2021 12:34:48 +0000 (13:34 +0100)]
JAL-3855 check for existence of an alpha fold model when pinging the PDBe
Jim Procter [Tue, 27 Jul 2021 12:33:31 +0000 (13:33 +0100)]
JAL-3855 convenience method to check a URL will return a 200
Ben Soares [Wed, 21 Jul 2021 11:50:15 +0000 (12:50 +0100)]
JAL-3850 fixed full class name
Ben Soares [Wed, 21 Jul 2021 11:32:31 +0000 (12:32 +0100)]
JAL-3850 using reflection for SimpleHttpFileServerFactory
Ben Soares [Fri, 18 Jun 2021 14:29:59 +0000 (15:29 +0100)]
JAL-3594 Updated the Jalview Develop getdown splashscreen image with Geoff's license free photo
Jim Procter [Wed, 9 Jun 2021 15:53:09 +0000 (16:53 +0100)]
JAL-3840 don’t update the modal residue count for gaps
Jim Procter [Wed, 9 Jun 2021 15:40:42 +0000 (16:40 +0100)]
fixes JAL-3840
Jim Procter [Wed, 9 Jun 2021 15:35:11 +0000 (16:35 +0100)]
JAL-3840 failing test - show that addGaps overflows
Ben Soares [Tue, 8 Jun 2021 16:11:56 +0000 (17:11 +0100)]
Merge branch 'develop' into improvement/JAL-3830_macOS_bundle_wrapper
Ben Soares [Mon, 26 Apr 2021 19:00:40 +0000 (20:00 +0100)]
JAL-3248 Moved old README to doc/old_README and put pointers in new README for deskopt application building and JalviewJS building
Ben Soares [Mon, 26 Apr 2021 16:56:19 +0000 (17:56 +0100)]
JAL-3743 JAL-3745 Fixed NullPointerExceptions happening with linkCheck and jalviewjsTranspile tasks when gradle >= 6.6
Ben Soares [Thu, 22 Apr 2021 14:20:41 +0000 (15:20 +0100)]
JAL-3833 Allow setHiDPI and setHiDPIScale to work more usefully in real life
Ben Soares [Sun, 18 Apr 2021 19:31:07 +0000 (20:31 +0100)]
JAL-3833 cap the scaling used by HiDPISetting for incorrect DPI values or incorrect height/width values
Ben Soares [Tue, 13 Apr 2021 16:40:10 +0000 (17:40 +0100)]
JAL-3830 Improved jalview.bat to find either pwsh.exe or powershell.exe, and give better messages to the user
Jim Procter [Tue, 6 Apr 2021 14:04:46 +0000 (15:04 +0100)]
JAL-3832 dummy 3d-beacons database client and code to create the TDBeaconsFTSPanel via the sequence fetcher dropdown menu
arngucci [Tue, 6 Apr 2021 13:25:18 +0000 (15:25 +0200)]
JAL-3829 more testing wit tdbeacons data columns and FTSclient
Arnaldo [Thu, 1 Apr 2021 13:28:59 +0000 (15:28 +0200)]
JAL-3829 attempt to fix my changes to follow the Jira issue
Ben Soares [Wed, 31 Mar 2021 22:16:56 +0000 (23:16 +0100)]
JAL-3830 BAT file wrapper around powershell, so jalview works in command prompt. Added install4j option for installer to add Jalview's bin dir to Path in Windows. Added install4j option to create symlink to bash script to user's local bin (first of ~/bin, ~/.local/bin, ~/local/bin, ~/opt/bin that exists. First two of these usually automatically in PATH).
Ben Soares [Tue, 30 Mar 2021 00:43:52 +0000 (01:43 +0100)]
JAL-3830 Follow all SymbolicLinks in Windows powershell wrapper
Arnaldo [Mon, 29 Mar 2021 12:39:38 +0000 (14:39 +0200)]
fixed last commit
Arnaldo [Mon, 29 Mar 2021 08:51:09 +0000 (10:51 +0200)]
Request now parses the whole structures, need to fix the result
Ben Soares [Fri, 26 Mar 2021 17:30:18 +0000 (17:30 +0000)]
JAL-3830 delete channel.props and channel.propsv when uninstalling
Arnaldo [Thu, 25 Mar 2021 15:49:48 +0000 (16:49 +0100)]
TDB.executeRequest fix & test passed
Arnaldo [Thu, 25 Mar 2021 14:47:13 +0000 (15:47 +0100)]
Added (and passed !)all the FTS tests from test.fts.core
Arnaldo [Thu, 25 Mar 2021 14:20:11 +0000 (15:20 +0100)]
Created 3Dbeacons data_columns.txt Test passed for data columns
Ben Soares [Wed, 24 Mar 2021 01:49:24 +0000 (01:49 +0000)]
JAL-3830 Moved wrappers to bin/jalview.* and make a symlink bin/jalview. Install4j script now jalviewg
Ben Soares [Wed, 17 Mar 2021 23:15:11 +0000 (23:15 +0000)]
JAL-3830 Allow paths to start with '~'. Make path check more succinct.
Ben Soares [Wed, 17 Mar 2021 21:06:11 +0000 (21:06 +0000)]
JAL-3830 Now using a single universal bash script (jalviewc) for bash in linux, macos, cygwin and WSL. It keeps things together.
Ben Soares [Wed, 17 Mar 2021 00:30:55 +0000 (00:30 +0000)]
JAL-3830 add the windows bash script to getdown files and install4j installers
Ben Soares [Wed, 17 Mar 2021 00:22:00 +0000 (00:22 +0000)]
JAL-3830 bash script that works in both cygwin and WSL (Windows Subsystem for Linux)
Ben Soares [Mon, 15 Mar 2021 16:56:52 +0000 (16:56 +0000)]
JAL-3830 Delete wrapper scripts and getdown *v files when uninstalling
Ben Soares [Mon, 15 Mar 2021 15:21:53 +0000 (15:21 +0000)]
JAL-3830 powershell wrapper tested on linux, macos and windows including spaces in paths. This is the way.
Arnaldo [Mon, 15 Mar 2021 11:59:16 +0000 (12:59 +0100)]
added untracked parsing attempts files