From: Ben Soares Date: Thu, 27 Apr 2023 17:36:10 +0000 (+0100) Subject: JAL-629 Changed --increment to --newframe to make sense to user X-Git-Tag: Release_2_11_4_0~366 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=55dc379e013ee8d6199e531b8e3d9482d33acfd4;p=jalview.git JAL-629 Changed --increment to --newframe to make sense to user --- diff --git a/src/jalview/bin/argparser/Arg.java b/src/jalview/bin/argparser/Arg.java index ab3cca7..9b5907f 100644 --- a/src/jalview/bin/argparser/Arg.java +++ b/src/jalview/bin/argparser/Arg.java @@ -14,7 +14,7 @@ public enum Arg SORTBYTREE, USAGESTATS, APPEND, OPEN, PROPS, QUESTIONNAIRE, SETPROP, TREE, VDOC, VSESS, OUTPUT, OUTPUTTYPE, SSANNOTATIONS, NOTEMPFAC, TEMPFAC, TITLE, PAEMATRIX, WRAP, NOSTRUCTURE, STRUCTURE, STRUCTUREVIEWER, IMAGE, QUIT, - CLOSE, DEBUG("d"), QUIET("q"), ARGFILE, INCREMENT, NPP("n++"), + CLOSE, DEBUG("d"), QUIET("q"), ARGFILE, NEWFRAME, NPP("n++"), SUBSTITUTIONS, INITSUBSTITUTIONS, NIL, SPLASH, SETARGFILE, UNSETARGFILE, WEBSERVICEDISCOVERY; @@ -81,7 +81,7 @@ public enum Arg QUIET.setOptions(Opt.UNARY, Opt.MULTI, Opt.BOOTSTRAP); ARGFILE.setOptions(Opt.STRING, Opt.MULTI, Opt.BOOTSTRAP, Opt.GLOB, Opt.ALLOWSUBSTITUTIONS); - INCREMENT.setOptions(Opt.UNARY, Opt.MULTI, Opt.NOACTION); + NEWFRAME.setOptions(Opt.UNARY, Opt.MULTI, Opt.NOACTION); NPP.setOptions(Opt.UNARY, Opt.MULTI, Opt.NOACTION); SUBSTITUTIONS.setOptions(Opt.BOOLEAN, Opt.MULTI, Opt.NOACTION); INITSUBSTITUTIONS.setOptions(Opt.BOOLEAN, Opt.BOOTSTRAP, Opt.NOACTION); diff --git a/src/jalview/bin/argparser/ArgParser.java b/src/jalview/bin/argparser/ArgParser.java index d5e3bff..e08ae03 100644 --- a/src/jalview/bin/argparser/ArgParser.java +++ b/src/jalview/bin/argparser/ArgParser.java @@ -333,7 +333,7 @@ public class ArgParser // make NOACTION adjustments // default and auto counter increments - if (a == Arg.INCREMENT) + if (a == Arg.NEWFRAME) { defaultLinkedIdCounter++; }