Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into

[jalview.git] / src / jalview / util / dialogrunner / RunResponse.java

diff --git a/src/jalview/util/dialogrunner/RunResponse.java b/src/jalview/util/dialogrunner/RunResponse.java
index acc53f0..b97525b 100644 (file)
--- a/src/jalview/util/dialogrunner/RunResponse.java
+++ b/src/jalview/util/dialogrunner/RunResponse.java
@@ -32,48 +32,41 @@ public abstract class RunResponse implements Runnable
   /**
    * Response that triggers the Run method
    */
-  public Response ourTrigger;
+  Object trigger;
 
   /**
    * set by run() on exit
    */
-  public Response returned = null;
+  protected Object returnValue = null;
 
-  /**
-   * set by dialog runner
-   */
-  public boolean wasRun = false;
-
-  public RunResponse(int trigger)
+  public RunResponse(Object onTrigger)
   {
-    ourTrigger = new Response(trigger);
+    trigger = onTrigger;
   }
 
-  public RunResponse(Object trigger)
+  public Object getTrigger() 
   {
-    ourTrigger = new Response(trigger);
+   return trigger;
   }
-
-  public RunResponse(String trigger)
+  
+  public void reset()
   {
-    ourTrigger = new Response(trigger);
+    returnValue = null;
   }
 
-  public RunResponse(Response trigger)
+  @Override
+  public String toString()
   {
-    ourTrigger = trigger;
+    return "Runner for " + trigger;
   }
-
-  public void reset()
+  
+  public Object getReturnValue() 
   {
-    wasRun = false;
-    returned = null;
-
+       return returnValue;
   }
-
-  @Override
-  public String toString()
+  
+  public void setReturnValue(Object o) 
   {
-    return "Runner for " + ourTrigger;
+       returnValue = o;
   }
 }