update spikes/mungo from JAL-3076 patch branch

[jalview.git] / src / jalview / ws / params / simple / Option.java

diff --git a/src/jalview/ws/params/simple/Option.java b/src/jalview/ws/params/simple/Option.java
index f0126df..653359f 100644 (file)
--- a/src/jalview/ws/params/simple/Option.java
+++ b/src/jalview/ws/params/simple/Option.java
@@ -29,21 +29,10 @@ import java.util.List;
 
 public class Option implements OptionI
 {
-  String name;
 
-  /*
-   * current value in string format, or "null" if undefined
-   */
-  String value;
+  String name, value, defvalue, description;
 
-  /*
-   * default value in string format, or "null" if undefined
-   */
-  String defvalue;
-
-  String description;
-
-  ArrayList<String> possibleVals = new ArrayList<>();
+  ArrayList<String> possibleVals = new ArrayList<String>();
 
   boolean required;
 
@@ -95,17 +84,11 @@ public class Option implements OptionI
   {
     name = new String(opt.name);
     if (opt.value != null)
-    {
       value = new String(opt.value);
-    }
     if (opt.defvalue != null)
-    {
       defvalue = new String(opt.defvalue);
-    }
     if (opt.description != null)
-    {
       description = new String(opt.description);
-    }
     if (opt.possibleVals != null)
     {
       possibleVals = (ArrayList<String>) opt.possibleVals.clone();
@@ -130,7 +113,7 @@ public class Option implements OptionI
     this.defvalue = defValue;
     if (possibleVals != null)
     {
-      this.possibleVals = new ArrayList<>();
+      this.possibleVals = new ArrayList<String>();
       this.possibleVals.addAll(possibleVals);
     }
     this.fdetails = fdetails;
@@ -142,13 +125,4 @@ public class Option implements OptionI
     Option opt = new Option(this);
     return opt;
   }
-
-  /**
-   * toString method to help identify options in the debugger only
-   */
-  @Override
-  public String toString()
-  {
-    return this.getClass().getName() + ":" + name;
-  }
 }