JAL-3048 DialogRunner changes (wip)

[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 3fd56c4..7cb7e08 100644 (file)
--- a/src/jalview/util/dialogrunner/RunResponse.java
+++ b/src/jalview/util/dialogrunner/RunResponse.java
@@ -32,43 +32,57 @@ public abstract class RunResponse implements Runnable
   /**
    * Response that triggers the Run method
    */
-  public Response ourTrigger;
+  private Object trigger;
 
   /**
    * set by run() on exit
    */
-  public Response returned = null;
+  private Object returnValue = null;
 
   /**
    * set by dialog runner
    */
-  public boolean wasRun = false;
+  private 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)
-  {
-    ourTrigger = new Response(trigger);
-  }
-
+  
   public void reset()
   {
     wasRun = false;
-    returned = null;
-
+    returnValue = null;
   }
 
   @Override
   public String toString()
   {
-    return "Runner for " + ourTrigger;
+    return "Runner for " + trigger;
+  }
+  
+  public Object getReturnValue() 
+  {
+       return returnValue;
+  }
+  
+  public void setReturnValue(Object o) 
+  {
+       returnValue = o;
+  }
+  
+  public boolean hasBeenRun()
+  {
+       return wasRun;
+  }
+  
+  public void setRun()
+  {
+    wasRun = true;
   }
 }