Jim Procter [Fri, 1 Oct 2021 13:03:44 +0000 (14:03 +0100)]
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
Jim Procter [Fri, 1 Oct 2021 13:02:24 +0000 (14:02 +0100)]
JAL-3829 3d beacons logo - misi varadi gave permission to re-use but most likely it is CC-0
Ben Soares [Fri, 1 Oct 2021 11:35:22 +0000 (12:35 +0100)]
Merge branch 'improvement/JAL-3594_logos_for_jalview_test' into develop
Jim Procter [Fri, 1 Oct 2021 11:31:45 +0000 (12:31 +0100)]
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
Jim Procter [Fri, 1 Oct 2021 11:28:09 +0000 (12:28 +0100)]
JAL-3829 fetch 3D beacons now started by clicking button shown above the drop-down filter/manual input combo box.
Ben Soares [Fri, 1 Oct 2021 11:10:37 +0000 (12:10 +0100)]
Merge branch 'develop' into improvement/JAL-3594_logos_for_jalview_test
Ben Soares [Fri, 1 Oct 2021 11:08:16 +0000 (12:08 +0100)]
JAL-3594 New Jalview Test logos and .icns/.ico creation helper script
Jim Procter [Fri, 1 Oct 2021 09:35:08 +0000 (10:35 +0100)]
Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
Ben Soares [Thu, 30 Sep 2021 23:16:09 +0000 (00:16 +0100)]
JAL-3594 Changed logo for Jalview Test
Ben Soares [Thu, 30 Sep 2021 23:08:41 +0000 (00:08 +0100)]
JAL-1260 Added .gbk to GenBank extensions. Added GenBank extensions to the installer.
gmungoc [Tue, 11 Aug 2020 09:35:32 +0000 (10:35 +0100)]
JAL-3371 more fine-grained slider; set Param slider to initial default
Jim Procter [Thu, 30 Sep 2021 10:19:41 +0000 (11:19 +0100)]
Merge branch 'bug/JAL-3885_sequence_fetched_not_displaying_PFAM_Seed' into develop
Ben Soares [Wed, 29 Sep 2021 19:51:22 +0000 (20:51 +0100)]
JAL-3885 Made the database JComboBox have StringPair entries to allow a display value, set to the single item dbname if there's a single item
Jim Procter [Wed, 29 Sep 2021 14:50:09 +0000 (15:50 +0100)]
JAL-3884 squish alarming but harmless errors when uniprot doesn’t have a record
Jim Procter [Wed, 29 Sep 2021 14:32:09 +0000 (15:32 +0100)]
JAL-3881 split on any nonalphanumeric symbol (plus _) to generate putative sequence identifiers with which to query databases
Jim Procter [Wed, 29 Sep 2021 14:30:32 +0000 (15:30 +0100)]
JAL-3829 report when 3d-beacons doesn’t provide any models
Ben Soares [Tue, 28 Sep 2021 15:09:42 +0000 (16:09 +0100)]
JAL-3783 Updated groovy-all-2.4. Currently newer stable releases cause a problem with shadowJar.
Jim Procter [Mon, 27 Sep 2021 13:29:48 +0000 (14:29 +0100)]
JAL-3746 update the example corefile for jalviewjs
Jim Procter [Fri, 24 Sep 2021 16:23:24 +0000 (17:23 +0100)]
JAL-3829 open web page for 3d beacons structure by right-clicking and selecting pop up menu item
Jim Procter [Fri, 24 Sep 2021 13:23:50 +0000 (14:23 +0100)]
Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
Jim Procter [Fri, 24 Sep 2021 13:22:33 +0000 (14:22 +0100)]
JAL-3821 data file for failing test
Jim Procter [Fri, 24 Sep 2021 13:19:40 +0000 (14:19 +0100)]
JAL-3829 right click to view popup menu to show link - maybe better to have a link button in the table instead ?
Jim Procter [Fri, 24 Sep 2021 13:17:03 +0000 (14:17 +0100)]
JAL-3829 abstract essential TDB metadata from the user configurable data array displayed in the JTable
Jim Procter [Thu, 23 Sep 2021 16:27:23 +0000 (17:27 +0100)]
Merge branch 'features/r2_11_2/JAL-3821_reinstate_patch' into develop
Jim Procter [Thu, 23 Sep 2021 16:26:33 +0000 (17:26 +0100)]
JAL-3821 less ambiguous base class name for EMBL and GenBank flat file parsers
Jim Procter [Thu, 23 Sep 2021 16:24:16 +0000 (17:24 +0100)]
JAL-3821 ported to refactored FlatFile parser
Jim Procter [Thu, 23 Sep 2021 16:00:53 +0000 (17:00 +0100)]
JAL-3821 failing test
Jim Procter [Thu, 23 Sep 2021 14:26:15 +0000 (15:26 +0100)]
JAL-3692 JAL-3861 remove extra call to .parse() so we don’t process the file again
Jim Procter [Thu, 23 Sep 2021 13:04:02 +0000 (14:04 +0100)]
Merge branch 'patch/JAL-3874_newJmolAndGradleDedup' into develop
Ben Soares [Tue, 21 Sep 2021 23:08:45 +0000 (00:08 +0100)]
JAL-3691 automatic insertion of Locale.ROOT to toUpperCase() and toLowerCase() and added import java.util.Locale appropriately
Jim Procter [Tue, 21 Sep 2021 20:59:51 +0000 (21:59 +0100)]
JAL-3746 release notes and what’s new for 2.11.2 - in progress
Jim Procter [Tue, 21 Sep 2021 15:24:15 +0000 (16:24 +0100)]
Merge branch 'doc/JAL-3746_Release_2_11_2' into develop
Jim Procter [Tue, 21 Sep 2021 13:24:24 +0000 (14:24 +0100)]
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
Jim Procter [Tue, 21 Sep 2021 12:54:23 +0000 (13:54 +0100)]
JAL-3829 - callback finessing - leave DBRefFetcher to do progress updates itself
Jim Procter [Tue, 21 Sep 2021 10:41:18 +0000 (11:41 +0100)]
JAL-3829 prefix PDBe filters with PDBe to make clear what they search
Jim Procter [Tue, 21 Sep 2021 10:36:27 +0000 (11:36 +0100)]
JAL-3829 alternative UX: need to select 3d-beacons from dropdown if db-refs need to be fetched
Jim Procter [Tue, 21 Sep 2021 07:30:03 +0000 (08:30 +0100)]
JAL-3829 ignore the fake ID generated when a PDB format file without embedded ID is imported for an existing PDBEntry
Ben Soares [Tue, 21 Sep 2021 08:57:00 +0000 (09:57 +0100)]
JAL-3521 'Debian-safe' version of minimal build.gradle and patch. Using existing doc/*.html and build_properties from source tarball.
Ben Soares [Mon, 20 Sep 2021 16:48:27 +0000 (17:48 +0100)]
JAL-3521 Created a patch file to transform build.gradle into debian_build.gradle
Jim Procter [Mon, 20 Sep 2021 13:56:34 +0000 (14:56 +0100)]
JAL-3829 updated response for P01308
Jim Procter [Mon, 20 Sep 2021 13:56:15 +0000 (14:56 +0100)]
JAL-3829 tests need to wait for dialog to be closed and background processes to finish before they can check functionality
Jim Procter [Mon, 20 Sep 2021 13:55:27 +0000 (14:55 +0100)]
JAL-3829 TDBeacons fetcher needs a sequence with at least one canonical uniprot accession
Jim Procter [Mon, 20 Sep 2021 13:54:50 +0000 (14:54 +0100)]
JAL-3829 throw the exception even if it has no message
Jim Procter [Mon, 20 Sep 2021 13:54:14 +0000 (14:54 +0100)]
JAL-3829 ensure nulls are not wildcards when retrieving annotation by calcId/label/description
Ben Soares [Mon, 20 Sep 2021 13:25:48 +0000 (14:25 +0100)]
JAL-3521 working minimal build.gradle for debian and 2.11.2. Flexmark plugin might be a problem
Ben Soares [Mon, 20 Sep 2021 12:11:55 +0000 (13:11 +0100)]
JAL-3521 not quite working minimal build.gradle for debian and 2.11.2
Jim Procter [Mon, 20 Sep 2021 10:19:35 +0000 (11:19 +0100)]
JAL-3829 do better at detecting structure type, prompt to retrieve Uniprot ids for proteins without canonical Ids and show provider in the Structure Chooser’s cache view
Jim Procter [Mon, 20 Sep 2021 10:16:44 +0000 (11:16 +0100)]
JAL-3829 make sure structure data type reflects actual format identified
Jim Procter [Mon, 20 Sep 2021 10:14:41 +0000 (11:14 +0100)]
JAL-3829 store 3db metadata on PDBEntry so it can be shown in Cache/etc
Jim Procter [Mon, 20 Sep 2021 10:13:12 +0000 (11:13 +0100)]
JAL-3829 allow PDBEntry with file and ID with mismatching case to override one without a file
Ben Soares [Fri, 17 Sep 2021 17:16:57 +0000 (18:16 +0100)]
Merge branch 'merge/develop_JAL-1260' into develop
Ben Soares [Fri, 17 Sep 2021 17:11:05 +0000 (18:11 +0100)]
JAL-1260 rudimentary parsing of LOCUS line to at least get accession id
Jim Procter [Fri, 17 Sep 2021 16:42:17 +0000 (17:42 +0100)]
Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
Jim Procter [Fri, 17 Sep 2021 16:39:42 +0000 (17:39 +0100)]
JAL-3079 JAL-3055 remember to reset font transform after rendering logo
gmungoc [Tue, 18 Aug 2020 14:32:00 +0000 (15:32 +0100)]
JAL-1260 refactored multi-line qualifier separators
gmungoc [Tue, 18 Aug 2020 13:39:25 +0000 (14:39 +0100)]
JAL-1260 unit test for FileFormats updated for GenBank/ENA
gmungoc [Tue, 18 Aug 2020 13:22:56 +0000 (14:22 +0100)]
JAL-1260 file formats and IdentifyFile updates for GenBank and ENA
gmungoc [Tue, 18 Aug 2020 12:05:24 +0000 (13:05 +0100)]
JAL-1260 refactored GenBank (and EMBL) flat file parser
Jim Procter [Mon, 3 Aug 2020 13:07:03 +0000 (14:07 +0100)]
JAL-1260 FileFormat entry for EMBL/GENBANK: TODO: create tests and IdentifyFile routine for this format
Jim Procter [Fri, 17 Sep 2021 15:38:49 +0000 (16:38 +0100)]
JAL-3874 - replace Jmol with custom build of 14.31.53 from Jmol-SwingJS GitHub repo
Jim Procter [Fri, 17 Sep 2021 12:13:35 +0000 (13:13 +0100)]
JAL-2226 transfer chain annotation when calcId, label and description are distinct - so annotations from multiple chains and structures are all shown.
Jim Procter [Fri, 17 Sep 2021 12:12:34 +0000 (13:12 +0100)]
JAL-2226 new method to search for annotation matching particular description as well as calcId and label
Jim Procter [Fri, 17 Sep 2021 10:45:37 +0000 (11:45 +0100)]
JAL-3829 belt and braces check to make sure there is a pdbe response available to join records from
Ben Soares [Thu, 16 Sep 2021 17:07:09 +0000 (18:07 +0100)]
JAL-3779 Added to documentation
gmungoc [Fri, 20 Nov 2020 13:04:11 +0000 (13:04 +0000)]
JAL-3779 apply properties to all groups with given name, not just first
Ben Soares [Thu, 16 Sep 2021 12:53:55 +0000 (13:53 +0100)]
JAL-3774 combined changes from bug/JAL-3774_splitFrameFinder: i) fixed focus Finder from split frame. ii) missing i18n added, overlong translation shortened. iii) better translation.
Jim Procter [Thu, 16 Sep 2021 12:47:35 +0000 (13:47 +0100)]
Merge branch 'develop' into doc/JAL-3746_Release_2_11_2
Ben Soares [Thu, 16 Sep 2021 11:07:52 +0000 (12:07 +0100)]
JAL-3739 (combined) commits from feature/JAL-3739_useFormFieldText
Jim Procter [Fri, 8 Jan 2021 16:06:59 +0000 (16:06 +0000)]
JAL-3794 X and N are counted as DNA characters, but we also check how many Ns - if there were no real nucleotide characters we always return protein for poly-asparagine
Jim Procter [Fri, 8 Jan 2021 16:05:39 +0000 (16:05 +0000)]
JAL-3794 new test for recognition of protein or DNA with ambiguity characters, including the ‘all N’ case (that should be protein..).
Ben Soares [Thu, 16 Sep 2021 09:24:10 +0000 (10:24 +0100)]
JAL-3761 listToArray became rangeListToArray
gmungoc [Sat, 26 Dec 2020 08:51:37 +0000 (08:51 +0000)]
JAL-3761 more consistent parameter naming
gmungoc [Wed, 2 Dec 2020 19:59:33 +0000 (19:59 +0000)]
JAL-3761 helper method reinstated to avoid code duplication
gmungoc [Thu, 26 Nov 2020 14:17:41 +0000 (14:17 +0000)]
JAL-3761 locateInFrom/To revised with tests; unused methods removed
gmungoc [Fri, 20 Nov 2020 11:59:09 +0000 (11:59 +0000)]
JAL-3761 extra check that VCF feature is fully mappable to sequence
gmungoc [Fri, 20 Nov 2020 11:58:42 +0000 (11:58 +0000)]
JAL-3761 debugged and working (but not tidied) locateInFrom2/To2
Ben Soares [Thu, 16 Sep 2021 09:17:51 +0000 (10:17 +0100)]
JAL-3761 listToArray became rangeListToArray
gmungoc [Thu, 12 Nov 2020 10:03:02 +0000 (10:03 +0000)]
JAL-3761 locateInFrom2 work in progress commit
gmungoc [Thu, 29 Oct 2020 15:50:58 +0000 (15:50 +0000)]
JAL-3761 unit test for MapList.countPos()
gmungoc [Thu, 8 Oct 2020 07:40:18 +0000 (08:40 +0100)]
JAL-3761 failing test, formatting, method renamed
gmungoc [Thu, 1 Oct 2020 11:42:32 +0000 (12:42 +0100)]
JAL-3761 failing tests for locateInFrom/To with overlapping ranges
gmungoc [Thu, 24 Sep 2020 10:55:20 +0000 (11:55 +0100)]
JAL-3751 only merge strictly contiguous ranges of mappings
gmungoc [Tue, 29 Dec 2020 16:38:35 +0000 (16:38 +0000)]
JAL-3788 synchronize concurrent findColour() and alignmentChanged()
Ben Soares [Wed, 15 Sep 2021 19:00:48 +0000 (20:00 +0100)]
JAL-3818 formatting
gmungoc [Thu, 11 Feb 2021 11:30:20 +0000 (11:30 +0000)]
JAL-3818 process Jmol callbacks in AWT thread
Ben Soares [Wed, 15 Sep 2021 16:19:15 +0000 (17:19 +0100)]
Merge branch 'develop' into merge/develop_ben2
Ben Soares [Wed, 15 Sep 2021 16:16:25 +0000 (17:16 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
Ben Soares [Wed, 15 Sep 2021 16:16:17 +0000 (17:16 +0100)]
JAL-3829 Fixed Jmol jar -- duplicates of other classes were causing problem with shadow jar
Jim Procter [Wed, 15 Sep 2021 16:06:02 +0000 (17:06 +0100)]
Merge branch 'Jalview-JS/bug/JAL-3762_URLparamsOverrideInfoArg' into develop
Jim Procter [Wed, 15 Sep 2021 15:28:29 +0000 (16:28 +0100)]
JAL-3746 fix bad merge from 2.11.1.4/5 branch cherrypick
Jim Procter [Wed, 15 Sep 2021 15:19:08 +0000 (16:19 +0100)]
JAL-3842 fix automatic what's new link for custom version builds
Jim Procter [Wed, 15 Sep 2021 15:17:11 +0000 (16:17 +0100)]
JAL-3842 2.11.1.5 what’s new, release notes, and version bump
Conflicts:
RELEASE
Jim Procter [Wed, 15 Sep 2021 15:16:15 +0000 (16:16 +0100)]
JAL-3816 bump version number and cut release notes
Conflicts:
RELEASE
doc/building.html
Jim Procter [Wed, 15 Sep 2021 15:11:33 +0000 (16:11 +0100)]
JAL-3766 cut new patch release
Conflicts:
RELEASE
Jim Procter [Wed, 15 Sep 2021 15:10:52 +0000 (16:10 +0100)]
JAL-3758 2.11.1.2 patch release notes and version bump
Conflicts:
RELEASE
Jim Procter [Wed, 15 Sep 2021 15:09:52 +0000 (16:09 +0100)]
JAL-3741 http to https (and jar to jvp for exampleFile defaults!)
Conflicts:
src/jalview/bin/Jalview.java
src/jalview/gui/Desktop.java
Jim Procter [Wed, 15 Sep 2021 15:00:20 +0000 (16:00 +0100)]
JAL-3477 added help documentation for executable jar command line arguments -jvmmempc and -jvmmemmax
Jim Procter [Wed, 15 Sep 2021 14:56:47 +0000 (15:56 +0100)]
JAL-3675 version update and documentation for JAL-3493 JAL-3680 JAL-3638
Conflicts:
RELEASE
Jim Procter [Wed, 15 Sep 2021 14:55:46 +0000 (15:55 +0100)]
JAL-3638 JAL-3680 fix docs for Alt + Arrow LRUD in cursor mode.
help/help/html/keys.html
Ben Soares [Wed, 15 Sep 2021 14:51:01 +0000 (15:51 +0100)]
Merge branch 'develop' into merge/develop_ben2