diff --git a/api/net/sf/briar/api/transport/TransportCallback.java b/api/net/sf/briar/api/transport/TransportCallback.java index b74e2eabed09cd514af9b792368550ff9f7a5df9..107fa5ae3cb3e44d1bfd862b14fc97cc5b1e3255 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 0763f43cdb23eb2dd15c5c6ad198892080599b27..fa8a93046ebf8e413d0b278c3f064e08ecb4bea5 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))); }});