JAL-629 change --renderer to --textrenderer to be more specific

diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java
index 7e33b17..a0209fd 100644 (file)
--- a/src/jalview/bin/Commands.java
+++ b/src/jalview/bin/Commands.java
@@ -495,7 +495,6 @@ public class Commands
           // get PAEMATRIX file and label from subvals or Arg.PAEMATRIX
           String paeFilepath = subVals.getWithSubstitutions(argParser, id,
                   "paematrix");
           // get PAEMATRIX file and label from subvals or Arg.PAEMATRIX
           String paeFilepath = subVals.getWithSubstitutions(argParser, id,
                   "paematrix");

-          String paeLabel = subVals.get("paelabel");

           ArgValue paeAv = getArgAssociatedWithStructure(Arg.PAEMATRIX, avm,
                   af, structureFilepath);
           if (paeFilepath == null && paeAv != null)
           ArgValue paeAv = getArgAssociatedWithStructure(Arg.PAEMATRIX, avm,
                   af, structureFilepath);
           if (paeFilepath == null && paeAv != null)

@@ -503,7 +502,6 @@ public class Commands
             SubVals sv = paeAv.getSubVals();
             File paeFile = new File(sv.getContent());
 
             SubVals sv = paeAv.getSubVals();
             File paeFile = new File(sv.getContent());
 

-            paeLabel = sv.get("label");

             try
             {
               paeFilepath = paeFile.getCanonicalPath();
             try
             {
               paeFilepath = paeFile.getCanonicalPath();

@@ -652,7 +650,7 @@ public class Commands
         File file = new File(fileName);
         String name = af.getName();
         String renderer = ArgParser.getValueFromSubValOrArg(avm, av,
         File file = new File(fileName);
         String name = af.getName();
         String renderer = ArgParser.getValueFromSubValOrArg(avm, av,

-                Arg.RENDERER, subVal);
+                Arg.TEXTRENDERER, subVal);

         if (renderer == null)
           renderer = "text";
         String type = "png"; // default
         if (renderer == null)
           renderer = "text";
         String type = "png"; // default

diff --git a/src/jalview/bin/argparser/Arg.java b/src/jalview/bin/argparser/Arg.java
index f83f267..763a6f2 100644 (file)
--- a/src/jalview/bin/argparser/Arg.java
+++ b/src/jalview/bin/argparser/Arg.java
@@ -14,7 +14,7 @@ public enum Arg
   DISPLAY, NEWS, SORTBYTREE, USAGESTATS, APPEND, OPEN, PROPS, QUESTIONNAIRE,
   SETPROP, TREE, VDOC, VSESS, OUTPUT, SSANNOTATIONS, NOTEMPFAC, TEMPFAC,
   TITLE, PAEMATRIX, WRAP, NOSTRUCTURE, STRUCTURE, STRUCTUREVIEWER, IMAGE,
   DISPLAY, NEWS, SORTBYTREE, USAGESTATS, APPEND, OPEN, PROPS, QUESTIONNAIRE,
   SETPROP, TREE, VDOC, VSESS, OUTPUT, SSANNOTATIONS, NOTEMPFAC, TEMPFAC,
   TITLE, PAEMATRIX, WRAP, NOSTRUCTURE, STRUCTURE, STRUCTUREVIEWER, IMAGE,

-  TYPE, FORMAT, OVERWRITE, RENDERER, QUIT, CLOSE, DEBUG("d"), TRACE,
+  TYPE, FORMAT, OVERWRITE, TEXTRENDERER, QUIT, CLOSE, DEBUG("d"), TRACE,

   QUIET("q"), ARGFILE, NEW, NPP("n++"), SUBSTITUTIONS, INITSUBSTITUTIONS,
   NIL, SPLASH, SETARGFILE, UNSETARGFILE, WEBSERVICEDISCOVERY, ALL, BACKUPS,
   TESTOUTPUT;
   QUIET("q"), ARGFILE, NEW, NPP("n++"), SUBSTITUTIONS, INITSUBSTITUTIONS,
   NIL, SPLASH, SETARGFILE, UNSETARGFILE, WEBSERVICEDISCOVERY, ALL, BACKUPS,
   TESTOUTPUT;

@@ -120,7 +120,7 @@ public enum Arg
             Opt.ALLOWALL, Opt.REQUIREINPUT);
     TYPE.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);
     FORMAT.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);
             Opt.ALLOWALL, Opt.REQUIREINPUT);
     TYPE.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);
     FORMAT.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);

-    RENDERER.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);
+    TEXTRENDERER.setOptions(Opt.STRING, Opt.LINKED, Opt.ALLOWALL);

     QUIT.setOptions(Opt.UNARY);
     OVERWRITE.setOptions(Opt.BOOLEAN, Opt.LINKED, Opt.ALLOWALL);
     BACKUPS.setOptions(true, Opt.BOOLEAN, Opt.LINKED, Opt.ALLOWALL);
     QUIT.setOptions(Opt.UNARY);
     OVERWRITE.setOptions(Opt.BOOLEAN, Opt.LINKED, Opt.ALLOWALL);
     BACKUPS.setOptions(true, Opt.BOOLEAN, Opt.LINKED, Opt.ALLOWALL);