JAL-591 OptionBox FlowLayout, tweaks to wrapping of options and params

[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 653359f..f0126df 100644 (file)
--- a/src/jalview/ws/params/simple/Option.java
+++ b/src/jalview/ws/params/simple/Option.java
@@ -29,10 +29,21 @@ import java.util.List;
 
 public class Option implements OptionI
 {
+  String name;
 
-  String name, value, defvalue, description;
+  /*
+   * current value in string format, or "null" if undefined
+   */
+  String value;
 
-  ArrayList<String> possibleVals = new ArrayList<String>();
+  /*
+   * default value in string format, or "null" if undefined
+   */
+  String defvalue;
+
+  String description;
+
+  ArrayList<String> possibleVals = new ArrayList<>();
 
   boolean required;
 
@@ -84,11 +95,17 @@ 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();
@@ -113,7 +130,7 @@ public class Option implements OptionI
     this.defvalue = defValue;
     if (possibleVals != null)
     {
-      this.possibleVals = new ArrayList<String>();
+      this.possibleVals = new ArrayList<>();
       this.possibleVals.addAll(possibleVals);
     }
     this.fdetails = fdetails;
@@ -125,4 +142,13 @@ 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;
+  }
 }