jalview.git
11 months agoJAL-629 Help and code with threads features/JAL-629_with_threads_NOT_PASSING_TESTS
Ben Soares [Mon, 15 May 2023 13:32:34 +0000 (14:32 +0100)]
JAL-629 Help and code with threads

11 months agoJAL-629 Add a --threads argument to allow a limited multiple number of alignframes...
Ben Soares [Mon, 15 May 2023 12:03:40 +0000 (13:03 +0100)]
JAL-629 Add a --threads argument to allow a limited multiple number of alignframes to be processed at once.

11 months agoJAL-629 add an {extension} substitution
Ben Soares [Sun, 14 May 2023 11:22:02 +0000 (12:22 +0100)]
JAL-629 add an {extension} substitution

11 months agoJAL-629 launcher shell script uses jalview.bin.Launcher so --jvmmmempc and --jvmmemma...
Ben Soares [Sat, 13 May 2023 11:13:24 +0000 (12:13 +0100)]
JAL-629 launcher shell script uses jalview.bin.Launcher so --jvmmmempc and --jvmmemmax work for it too.

11 months agoJAL-629 More docs
Ben Soares [Fri, 12 May 2023 16:15:07 +0000 (17:15 +0100)]
JAL-629 More docs

11 months agoJAL-629 extra test for --output open*.ext when used twice for different --open's
Ben Soares [Fri, 12 May 2023 14:47:29 +0000 (15:47 +0100)]
JAL-629 extra test for --output open*.ext when used twice for different --open's

11 months agoJAL-629 Added --opened arg which is like limiting --all to only the previously -...
Ben Soares [Fri, 12 May 2023 14:34:06 +0000 (15:34 +0100)]
JAL-629 Added --opened arg which is like limiting --all to only the previously --open'ed files. With tests.

11 months agoJAL-629 Add some shortnames to args. Add Opt.OUTPUT and allow --output=*.ext to be...
Ben Soares [Thu, 11 May 2023 21:25:59 +0000 (22:25 +0100)]
JAL-629 Add some shortnames to args. Add Opt.OUTPUT and allow --output=*.ext to be shorthand for --all --output {basename}.ext.

11 months agoJAL-629 Move clarguments documentation to default. Completed clarguments summary...
Ben Soares [Thu, 11 May 2023 19:39:10 +0000 (20:39 +0100)]
JAL-629 Move clarguments documentation to default.  Completed clarguments summary.  Most of clarguments basic

11 months agoJAL-629 Fix --tempfac. Hide non-working --notempfac. Add --scale, --width, --height...
Ben Soares [Thu, 11 May 2023 19:38:04 +0000 (20:38 +0100)]
JAL-629 Fix --tempfac. Hide non-working --notempfac.  Add --scale, --width, --height to PNG output.  Tidy usage.  Add --version.  More quietness for --quiet.  More consistently formatted stdout info,

11 months agoJAL-629 Added linkedId to ArgValuesMap for reference. Updated Arg descriptions. Made...
Ben Soares [Thu, 11 May 2023 10:34:39 +0000 (11:34 +0100)]
JAL-629 Added linkedId to ArgValuesMap for reference. Updated Arg descriptions. Made --quiet work better.

11 months agoJAL-629 Check Arg options for obtaining boolean or negative boolean arg from subvals
Ben Soares [Wed, 10 May 2023 12:54:52 +0000 (13:54 +0100)]
JAL-629 Check Arg options for obtaining boolean or negative boolean arg from subvals

11 months agoJAL-629 Catch a NPE, fix a test
Ben Soares [Wed, 10 May 2023 12:31:16 +0000 (13:31 +0100)]
JAL-629 Catch a NPE, fix a test

11 months agoJAL-629 More docs. Usage statement. Adjust some logging output to respect --quiet.
Ben Soares [Wed, 10 May 2023 11:11:38 +0000 (12:11 +0100)]
JAL-629 More docs. Usage statement. Adjust some logging output to respect --quiet.

11 months agoJAL-629 Add --seqid for non-subval use, make arg value naming more consistent in...
Ben Soares [Tue, 9 May 2023 10:19:37 +0000 (11:19 +0100)]
JAL-629 Add --seqid for non-subval use, make arg value naming more consistent in docs

11 months agoJAL-629 update a subval for structureviewer in the docs
Ben Soares [Tue, 9 May 2023 09:31:02 +0000 (10:31 +0100)]
JAL-629 update a subval for structureviewer in the docs

11 months agoJAL-629 more docs
Ben Soares [Tue, 9 May 2023 09:27:02 +0000 (10:27 +0100)]
JAL-629 more docs

11 months agoJAL-629 change --renderer to --textrenderer to be more specific
Ben Soares [Tue, 9 May 2023 09:26:36 +0000 (10:26 +0100)]
JAL-629 change --renderer to --textrenderer to be more specific

12 months agoJAL-629 test fixes
Ben Soares [Fri, 5 May 2023 09:42:55 +0000 (10:42 +0100)]
JAL-629 test fixes

12 months agoJAL-629 Moved additional CommandLineOperationsNG tests to testTask1
Ben Soares [Thu, 4 May 2023 16:30:23 +0000 (17:30 +0100)]
JAL-629 Moved additional CommandLineOperationsNG tests to testTask1

12 months agoJAL-629 More NG arguments: --features, --annotations, --sortbytree, --tree, --groovy...
Ben Soares [Thu, 4 May 2023 15:49:00 +0000 (16:49 +0100)]
JAL-629 More NG arguments: --features, --annotations, --sortbytree, --tree, --groovy.  More consistent arg naming and processing of test output.  Actual java process tests for ng commandline.  Store BootstrapArgs in ArgParser.

12 months agoJAL-629 a bit more documentation
Ben Soares [Wed, 3 May 2023 16:18:55 +0000 (17:18 +0100)]
JAL-629 a bit more documentation

12 months agoJAL-629 added eps and imagemap. Added --output and --format with test. Adjusted...
Ben Soares [Wed, 3 May 2023 14:49:59 +0000 (15:49 +0100)]
JAL-629 added eps and imagemap.  Added --output and --format with test.  Adjusted BackupFiles to cope with filename with no directory path.

12 months agoJAL-629 Changed --newframe and --allframes to --new and --all. More consistent -...
Ben Soares [Tue, 2 May 2023 17:22:47 +0000 (18:22 +0100)]
JAL-629 Changed --newframe and --allframes to --new and --all. More consistent --new and --open defaultLinkedId behaviour.

12 months agoJAL-629 Add --renderer arg/subval for vector output and fixed annotation renderer...
Ben Soares [Tue, 2 May 2023 11:29:55 +0000 (12:29 +0100)]
JAL-629 Add --renderer arg/subval for vector output and fixed annotation renderer code

12 months agoJAL-629 fix lang label names after adjusting colour scheme short names
Ben Soares [Mon, 1 May 2023 23:21:02 +0000 (00:21 +0100)]
JAL-629 fix lang label names after adjusting colour scheme short names

12 months agoJAL-629 real life test for --allframes
Ben Soares [Mon, 1 May 2023 00:36:51 +0000 (01:36 +0100)]
JAL-629 real life test for --allframes

12 months agoJAL-629 Change behaviour of --open GLOB to increment defaultLinkedId to allow --allfr...
Ben Soares [Sun, 30 Apr 2023 23:53:23 +0000 (00:53 +0100)]
JAL-629 Change behaviour of --open GLOB to increment defaultLinkedId to allow --allframes --output --image --close to act on each input file

12 months agoJAL-629 Only log to console FAILED tests
Ben Soares [Sat, 29 Apr 2023 23:29:12 +0000 (00:29 +0100)]
JAL-629 Only log to console FAILED tests

12 months agoJAL-629 Added --all arg, [*] linkedId and functionality to apply some args to all...
Ben Soares [Sat, 29 Apr 2023 23:28:48 +0000 (00:28 +0100)]
JAL-629 Added --all arg, [*] linkedId and functionality to apply some args to all linkedIds

12 months agoJAL-629 Fixed the argfile1 after subval separator change
Ben Soares [Fri, 28 Apr 2023 21:45:01 +0000 (22:45 +0100)]
JAL-629 Fixed the argfile1 after subval separator change

12 months agoJAL-629 Fixed the argfiletests after subval separator change
Ben Soares [Fri, 28 Apr 2023 20:31:20 +0000 (21:31 +0100)]
JAL-629 Fixed the argfiletests after subval separator change

12 months agoJAL-629 Fixed the argfile after subval separator change
Ben Soares [Fri, 28 Apr 2023 20:14:43 +0000 (21:14 +0100)]
JAL-629 Fixed the argfile after subval separator change

12 months agoJAL-629 Change colour scheme shortnames to something consistent and command-line...
Ben Soares [Fri, 28 Apr 2023 16:39:54 +0000 (17:39 +0100)]
JAL-629 Change colour scheme shortnames to something consistent and command-line friendly.  Add more subval options.  Change subval separator to ',' to be more command line friendly.

12 months agoJAL-4167 Now we don't fail testTasks on No Matching Tests so that all testTasks run...
Ben Soares [Fri, 28 Apr 2023 10:48:20 +0000 (11:48 +0100)]
JAL-4167 Now we don't fail testTasks on No Matching Tests so that all testTasks run with --tests option given

12 months agoJAL-629 Part-way to honouring --tests argument
Ben Soares [Thu, 27 Apr 2023 20:16:55 +0000 (21:16 +0100)]
JAL-629 Part-way to honouring --tests argument

12 months agoJAL-629 start of help text
Ben Soares [Thu, 27 Apr 2023 18:42:28 +0000 (19:42 +0100)]
JAL-629 start of help text

12 months agoJAL-629 changed args in tests
Ben Soares [Thu, 27 Apr 2023 18:41:21 +0000 (19:41 +0100)]
JAL-629 changed args in tests

12 months agoJAL-629 Fixed appending URLs
Ben Soares [Thu, 27 Apr 2023 17:36:24 +0000 (18:36 +0100)]
JAL-629 Fixed appending URLs

12 months agoJAL-629 Changed --increment to --newframe to make sense to user
Ben Soares [Thu, 27 Apr 2023 17:36:10 +0000 (18:36 +0100)]
JAL-629 Changed --increment to --newframe to make sense to user

12 months agoJAL-629 allow opening URL as only argument(s)
Ben Soares [Thu, 27 Apr 2023 14:23:19 +0000 (15:23 +0100)]
JAL-629 allow opening URL as only argument(s)

12 months agoJAL-4167 Added OVERALL summary to bash output
Ben Soares [Thu, 27 Apr 2023 11:36:15 +0000 (12:36 +0100)]
JAL-4167 Added OVERALL summary to bash output

12 months agoJAL-4167 Added colours to bash output
Ben Soares [Wed, 26 Apr 2023 16:39:10 +0000 (17:39 +0100)]
JAL-4167 Added colours to bash output

12 months agoJAL-4167 Allow a test to run in multiple testTasks
Ben Soares [Wed, 26 Apr 2023 13:27:50 +0000 (14:27 +0100)]
JAL-4167 Allow a test to run in multiple testTasks

12 months agoJAL-629 shorter wait times for this test
Ben Soares [Wed, 26 Apr 2023 12:00:00 +0000 (13:00 +0100)]
JAL-629 shorter wait times for this test

12 months agoJAL-4167 Adjustments to get clover to work with normal tests. Adjustment made on...
Ben Soares [Wed, 26 Apr 2023 11:11:49 +0000 (12:11 +0100)]
JAL-4167 Adjustments to get clover to work with normal tests.  Adjustment made on build server (TestNG Parser: build/reports/tests/**/testng-results.xml

12 months agoJAL-4167 Adjustments to get clover to work with normal tests
Ben Soares [Wed, 26 Apr 2023 10:22:51 +0000 (11:22 +0100)]
JAL-4167 Adjustments to get clover to work with normal tests

12 months agoJAL-4167 Adjustments to get clover to work
Ben Soares [Wed, 26 Apr 2023 10:10:57 +0000 (11:10 +0100)]
JAL-4167 Adjustments to get clover to work

12 months agoJAL-629 JAL-4167 Added args to tests. Fixed potential --headless arg bug. Added testT...
Ben Soares [Wed, 26 Apr 2023 01:32:55 +0000 (02:32 +0100)]
JAL-629 JAL-4167 Added args to tests. Fixed potential --headless arg bug. Added testTaskN tasks for separated tests, and code to make summary report when running normal test task.

12 months agoJAL-629 Add --nowebdiscovery. Distinguish arg=="open" as old style. Increase timeout...
Ben Soares [Mon, 24 Apr 2023 15:52:13 +0000 (16:52 +0100)]
JAL-629 Add --nowebdiscovery. Distinguish arg=="open" as old style. Increase timeout for commandlineoptions tests (for failing web services?).

12 months agoJAL-629 Put commandsTest.jvprops in the right place
Ben Soares [Mon, 24 Apr 2023 14:44:35 +0000 (15:44 +0100)]
JAL-629 Put commandsTest.jvprops in the right place

12 months agoJAL-629 loaded props from arg in failing build server tests
Ben Soares [Mon, 24 Apr 2023 12:39:46 +0000 (13:39 +0100)]
JAL-629 loaded props from arg in failing build server tests

12 months agoJAL-629 Dynamic sleep in test, more diagnostics
Ben Soares [Mon, 24 Apr 2023 10:07:46 +0000 (11:07 +0100)]
JAL-629 Dynamic sleep in test, more diagnostics

12 months agoJAL-629 Dynamic sleep in test
Ben Soares [Mon, 24 Apr 2023 10:06:17 +0000 (11:06 +0100)]
JAL-629 Dynamic sleep in test

12 months agoJAL-629 Move diagnostics to the right place
Ben Soares [Mon, 24 Apr 2023 09:54:56 +0000 (10:54 +0100)]
JAL-629 Move diagnostics to the right place

12 months agoJAL-629 Diagnosis output for failing test
Ben Soares [Mon, 24 Apr 2023 09:35:26 +0000 (10:35 +0100)]
JAL-629 Diagnosis output for failing test

12 months agoJAL-629 Count VISIBLE annotations for tests
Ben Soares [Mon, 24 Apr 2023 09:27:57 +0000 (10:27 +0100)]
JAL-629 Count VISIBLE annotations for tests

12 months agoJAL-629 attempt to fix tests on build server (more definite properties file)
Ben Soares [Mon, 24 Apr 2023 07:42:41 +0000 (08:42 +0100)]
JAL-629 attempt to fix tests on build server (more definite properties file)

12 months agoJAL-629 single threaded test for viewer window for build server
Ben Soares [Sun, 23 Apr 2023 19:05:00 +0000 (20:05 +0100)]
JAL-629 single threaded test for viewer window for build server

12 months agoJAL-629 even longer wait for viewer window for build server
Ben Soares [Sun, 23 Apr 2023 18:59:08 +0000 (19:59 +0100)]
JAL-629 even longer wait for viewer window for build server

12 months agoJAL-629 longer wait for viewer window for build server
Ben Soares [Sun, 23 Apr 2023 18:40:43 +0000 (19:40 +0100)]
JAL-629 longer wait for viewer window for build server

12 months agoJAL-629 Change --open to --append and --opennew to --open. Make --open(new) part...
Ben Soares [Sun, 23 Apr 2023 11:35:42 +0000 (12:35 +0100)]
JAL-629 Change --open to --append and --opennew to --open. Make --open(new) part of the same default linkedId scheme.  Add and adjust tests.

12 months agoJAL-629 Test and fix --annotation --ssannotation args. Added a viewerType arg/subval...
Ben Soares [Sat, 22 Apr 2023 00:26:15 +0000 (01:26 +0100)]
JAL-629 Test and fix --annotation --ssannotation args. Added a viewerType arg/subval. Fixed multi value getClosest...(). Added a jalview.bin.Launcher eclipse script.  Lots of tests for opening structures from CLI.

12 months agoJAL-629 Now showing temp fac and secondary structure for File opened structures and...
Ben Soares [Wed, 19 Apr 2023 16:21:43 +0000 (17:21 +0100)]
JAL-629 Now showing temp fac and secondary structure for File opened structures and command line added structure. Added linegraph annotation marks for 'singleton' data points. Added splashscreen property.  Adjusted test_fab41.result argfile.

12 months agoJAL-629 Adding PAE and TFType at structure loading time. Display PAE automatically
Ben Soares [Fri, 14 Apr 2023 17:14:23 +0000 (18:14 +0100)]
JAL-629 Adding PAE and TFType at structure loading time.  Display PAE automatically

12 months agoMerge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Wed, 12 Apr 2023 14:49:00 +0000 (15:49 +0100)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629

12 months agoJAL-629 deleted test output file from repo
Ben Soares [Wed, 12 Apr 2023 14:37:29 +0000 (15:37 +0100)]
JAL-629 deleted test output file from repo

12 months agoJAL-629 mild improvement to test
Ben Soares [Wed, 12 Apr 2023 14:20:40 +0000 (15:20 +0100)]
JAL-629 mild improvement to test

12 months agoJAL-629 Fixed ~ based test for build server
Ben Soares [Wed, 12 Apr 2023 13:41:23 +0000 (14:41 +0100)]
JAL-629 Fixed ~ based test for build server

12 months agoJAL-629 Add substituteHomeDir to getDirname(). Tighten dirname tests
Ben Soares [Wed, 12 Apr 2023 13:24:21 +0000 (14:24 +0100)]
JAL-629 Add substituteHomeDir to getDirname().  Tighten dirname tests

12 months agoJAL-629 Put old -props back as will now use old parser
Ben Soares [Wed, 12 Apr 2023 13:23:11 +0000 (14:23 +0100)]
JAL-629 Put old -props back as will now use old parser

12 months agoJAL-629 Fix non-multi string bootstrap arg bug.
Ben Soares [Wed, 12 Apr 2023 11:44:08 +0000 (12:44 +0100)]
JAL-629 Fix non-multi string bootstrap arg bug.

12 months agoJAL-629 setprop test disabled as feature is disabled
Ben Soares [Wed, 12 Apr 2023 10:31:03 +0000 (11:31 +0100)]
JAL-629 setprop test disabled as feature is disabled

12 months agoJAL-629 parse SubVals once with ArgValue. Ensure SubVals exists. Change to setprops...
Ben Soares [Wed, 12 Apr 2023 10:21:44 +0000 (11:21 +0100)]
JAL-629 parse SubVals once with ArgValue. Ensure SubVals exists. Change to setprops in Jalview.java comment

12 months agoJAL-629 allow argfiles in argfiles, but avoid looping argfiles
Ben Soares [Wed, 12 Apr 2023 10:19:37 +0000 (11:19 +0100)]
JAL-629 allow argfiles in argfiles, but avoid looping argfiles

12 months agoJAL-629 allow comments in argfiles '#'
Ben Soares [Wed, 12 Apr 2023 10:17:53 +0000 (11:17 +0100)]
JAL-629 allow comments in argfiles '#'

12 months agoJAL-629 DON'T use quotation marks in argfiles as they are not interpreted (or needed)
Ben Soares [Wed, 12 Apr 2023 10:15:10 +0000 (11:15 +0100)]
JAL-629 DON'T use quotation marks in argfiles as they are not interpreted (or needed)

12 months agoJAL-629 Tests for FileUtils. Tidying counter substitutions. Fixing PAE opening.
Ben Soares [Wed, 5 Apr 2023 15:29:31 +0000 (16:29 +0100)]
JAL-629 Tests for FileUtils. Tidying counter substitutions. Fixing PAE opening.

13 months agoJAL-629 more info in usage statement
Ben Soares [Tue, 4 Apr 2023 19:45:08 +0000 (20:45 +0100)]
JAL-629 more info in usage statement

13 months agoJAL-629 Start of Usage statement
Ben Soares [Tue, 4 Apr 2023 17:28:16 +0000 (18:28 +0100)]
JAL-629 Start of Usage statement

13 months agoJAL-629 More consistent printing of --arguments. Example nf-core argfile
Ben Soares [Tue, 4 Apr 2023 15:27:48 +0000 (16:27 +0100)]
JAL-629 More consistent printing of --arguments. Example nf-core argfile

13 months agoJAL-629 Remove debugging comment
Ben Soares [Tue, 4 Apr 2023 10:37:45 +0000 (11:37 +0100)]
JAL-629 Remove debugging comment

13 months agoJAL-629 --initsubstitutions as a bootstrap arg, new tests
Ben Soares [Tue, 4 Apr 2023 10:36:50 +0000 (11:36 +0100)]
JAL-629 --initsubstitutions as a bootstrap arg, new tests

13 months agoJAL-629 sort files from java glob for predictability. reduce maxdepth of walkfiletree
Ben Soares [Mon, 3 Apr 2023 22:31:28 +0000 (23:31 +0100)]
JAL-629 sort files from java glob for predictability. reduce maxdepth of walkfiletree

13 months agoJAL-629 Removed --headless to fix CommandsTest
Ben Soares [Mon, 3 Apr 2023 18:22:06 +0000 (19:22 +0100)]
JAL-629 Removed --headless to fix CommandsTest

13 months agoJAL-629 added setprop. More filename based substitutions enabled. Test for these.
Ben Soares [Mon, 3 Apr 2023 17:04:37 +0000 (18:04 +0100)]
JAL-629 added setprop. More filename based substitutions enabled.  Test for these.

13 months agoMerge branch 'features/JAL-4134_treeviewerforcolumns' into develop feature/JAL-4162_Read_and_write_Relaxed_PHYLIP_format new_feature/JAL-4019_ambiguous_base_colourscheme
James Procter [Fri, 31 Mar 2023 09:29:53 +0000 (11:29 +0200)]
Merge branch 'features/JAL-4134_treeviewerforcolumns' into develop

13 months agoJAL-629 More extensive tests with real files being opened
Ben Soares [Thu, 30 Mar 2023 15:25:58 +0000 (16:25 +0100)]
JAL-629 More extensive tests with real files being opened

13 months agoJAL-629 fix bug for opening single named file with no args
Ben Soares [Thu, 30 Mar 2023 15:25:34 +0000 (16:25 +0100)]
JAL-629 fix bug for opening single named file with no args

13 months agoJAL-629 Don't use new ArgParser if there are no --args and some -args
Ben Soares [Thu, 30 Mar 2023 13:10:57 +0000 (14:10 +0100)]
JAL-629 Don't use new ArgParser if there are no --args and some -args

13 months agoJAL-629 fix SubVals npe
Ben Soares [Thu, 30 Mar 2023 08:34:55 +0000 (09:34 +0100)]
JAL-629 fix SubVals npe

13 months agoJAL-629 extensive tests for ArgParser features
Ben Soares [Wed, 29 Mar 2023 23:01:12 +0000 (00:01 +0100)]
JAL-629 extensive tests for ArgParser features

13 months agoJAL-629 Added --opennew --nonews --nosplash. Added java globbing for = e.g. --open...
Ben Soares [Wed, 29 Mar 2023 22:31:46 +0000 (23:31 +0100)]
JAL-629 Added --opennew --nonews --nosplash. Added java globbing for = e.g. --open=**/*.fa. General debugging of argparser features for tests

13 months agoJAL-629 Opening files in new windows. not working yet
Ben Soares [Tue, 28 Mar 2023 10:17:23 +0000 (11:17 +0100)]
JAL-629 Opening files in new windows. not working yet

13 months agoJAL-629 open initial non-Arg arguments as files in separate alignment frames
Ben Soares [Sat, 25 Mar 2023 21:32:08 +0000 (21:32 +0000)]
JAL-629 open initial non-Arg arguments as files in separate alignment frames

13 months agoJAL-629 improvements to argparser toString. Improvements to cli paeFile structure...
Ben Soares [Sat, 25 Mar 2023 01:05:19 +0000 (01:05 +0000)]
JAL-629 improvements to argparser toString. Improvements to cli paeFile structure selection. Allow label subval for paefile

13 months agoMerge branch 'develop' into features/JAL-4134_treeviewerforcolumns
James Procter [Fri, 24 Mar 2023 13:30:31 +0000 (13:30 +0000)]
Merge branch 'develop' into features/JAL-4134_treeviewerforcolumns

13 months agoJAL-4158 first attempt at stashing colours for contact matrix groups and allowing...
James Procter [Fri, 24 Mar 2023 07:02:13 +0000 (07:02 +0000)]
JAL-4158 first attempt at stashing colours for contact matrix groups and allowing them to be overlayed on the contact matrix visual. NEEDS TESTS!

13 months agoMerge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Fri, 24 Mar 2023 00:20:30 +0000 (00:20 +0000)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629

13 months agoJAL-629 Test tidyup
Ben Soares [Fri, 24 Mar 2023 00:19:42 +0000 (00:19 +0000)]
JAL-629 Test tidyup