From f8ca06f79d908eeb12f9307786d174473acd2b13 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 6 Oct 2011 11:13:19 +0100
Subject: [PATCH] Changed callback arguments to varargs and renamed a method.
---
.../api/transport/TransportCallback.java | 8 ++++----
.../file/RemovableDrivePluginTest.java | 20 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/api/net/sf/briar/api/transport/TransportCallback.java b/api/net/sf/briar/api/transport/TransportCallback.java
index b74e2eabed..107fa5ae3c 100644
--- a/api/net/sf/briar/api/transport/TransportCallback.java
+++ b/api/net/sf/briar/api/transport/TransportCallback.java
@@ -4,13 +4,13 @@ import java.util.Map;
public interface TransportCallback {
- void setLocalTransports(Map<String, String> transports);
+ void setLocalProperties(Map<String, String> properties);
void setConfig(Map<String, String> config);
- void showMessage(String message);
+ void showMessage(String... message);
- boolean showConfirmationMessage(String message);
+ boolean showConfirmationMessage(String... message);
- int showChoice(String message, String[] choices);
+ int showChoice(String[] choices, String... message);
}
diff --git a/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java b/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
index 0763f43cdb..fa8a93046e 100644
--- a/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
+++ b/test/net/sf/briar/plugins/file/RemovableDrivePluginTest.java
@@ -99,8 +99,8 @@ public class RemovableDrivePluginTest extends TestCase {
oneOf(monitor).start(with(any(Callback.class)));
oneOf(finder).findRemovableDrives();
will(returnValue(drives));
- oneOf(callback).showChoice(with(any(String.class)),
- with(any(String[].class)));
+ oneOf(callback).showChoice(with(any(String[].class)),
+ with(any(String.class)));
will(returnValue(-1)); // The user cancelled the choice
}});
@@ -136,8 +136,8 @@ public class RemovableDrivePluginTest extends TestCase {
oneOf(monitor).start(with(any(Callback.class)));
oneOf(finder).findRemovableDrives();
will(returnValue(drives));
- oneOf(callback).showChoice(with(any(String.class)),
- with(any(String[].class)));
+ oneOf(callback).showChoice(with(any(String[].class)),
+ with(any(String.class)));
will(returnValue(0)); // The user chose drive1 but it doesn't exist
}});
@@ -175,8 +175,8 @@ public class RemovableDrivePluginTest extends TestCase {
oneOf(monitor).start(with(any(Callback.class)));
oneOf(finder).findRemovableDrives();
will(returnValue(drives));
- oneOf(callback).showChoice(with(any(String.class)),
- with(any(String[].class)));
+ oneOf(callback).showChoice(with(any(String[].class)),
+ with(any(String.class)));
will(returnValue(0)); // The user chose drive1 but it's not a dir
}});
@@ -214,8 +214,8 @@ public class RemovableDrivePluginTest extends TestCase {
oneOf(monitor).start(with(any(Callback.class)));
oneOf(finder).findRemovableDrives();
will(returnValue(drives));
- oneOf(callback).showChoice(with(any(String.class)),
- with(any(String[].class)));
+ oneOf(callback).showChoice(with(any(String[].class)),
+ with(any(String.class)));
will(returnValue(0)); // The user chose drive1
}});
@@ -256,8 +256,8 @@ public class RemovableDrivePluginTest extends TestCase {
oneOf(monitor).start(with(any(Callback.class)));
oneOf(finder).findRemovableDrives();
will(returnValue(drives));
- oneOf(callback).showChoice(with(any(String.class)),
- with(any(String[].class)));
+ oneOf(callback).showChoice(with(any(String[].class)),
+ with(any(String.class)));
will(returnValue(0)); // The user chose drive1
oneOf(callback).showMessage(with(any(String.class)));
}});
--
GitLab