From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 18 Dec 2018 12:31:57 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into
X-Git-Tag: Release_2_11_4_0~45^2~18^2~343^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8e73dcd57f5558b39b3f431667457d78a3cec427;p=jalview.git

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

Conflicts:
	test/jalview/util/dialogrunner/DialogRunnerTest.java
---

8e73dcd57f5558b39b3f431667457d78a3cec427
diff --cc test/jalview/util/dialogrunner/DialogRunnerTest.java
index b89c4bf,ec61551..b24c599
--- a/test/jalview/util/dialogrunner/DialogRunnerTest.java
+++ b/test/jalview/util/dialogrunner/DialogRunnerTest.java
@@@ -1,39 -1,24 +1,39 @@@
  package jalview.util.dialogrunner;
  
 -import org.testng.Assert;
 +import static org.testng.Assert.assertEquals;
 +import static org.testng.Assert.assertFalse;
 +import static org.testng.Assert.assertTrue;
 +
 +import java.util.Collection;
 +import java.util.List;
 +import java.util.Map;
 +
  import org.testng.annotations.Test;
  
 +import junit.extensions.PA;
 +
  public class DialogRunnerTest
  {
-   public class MockDialog implements DialogRunnerI
+   public class MockDialog implements DialogRunnerI<MockDialog>
    {
 -    DialogRunner<MockDialog> runner = new DialogRunner<>(this);
 +    DialogRunnerI runner = new DialogRunner();
  
      @Override
 -    public MockDialog addResponse(RunResponse action)
 +    public DialogRunnerI addResponse(Object response, RunResponse action)
      {
 -      return runner.addResponse(action);
 +      return runner.addResponse(response, action);
      }
  
 -    public void doDialog(String resp)
 +    public List<RunResponse> doDialog(String resp)
      {
 -      runner.firstRun(resp);
 +      return runner.handleResponse(resp);
      }
 +
 +	@Override
 +	public List<RunResponse> handleResponse(Object response) 
 +	{
 +	  return null;
 +	}
    }
  
    MockDialog dialog = new MockDialog();