From be3b0bf4d6dcf01aadc64ea312927aaf2002f7f3 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 12 Mar 2013 13:59:55 +0000
Subject: [PATCH] Renamed some factory methods.
---
.../src/net/sf/briar/api/messaging/MessageFactory.java | 4 ++--
.../src/net/sf/briar/messaging/MessageFactoryImpl.java | 8 ++++----
briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
index ade4acda4e..85cc33b661 100644
--- a/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
+++ b/briar-api/src/net/sf/briar/api/messaging/MessageFactory.java
@@ -11,12 +11,12 @@ public interface MessageFactory {
byte[] body) throws IOException, GeneralSecurityException;
/** Creates an anonymous message to an unrestricted group. */
- Message createAnonymousGroupMessage(MessageId parent, Group group,
+ Message createAnonymousMessage(MessageId parent, Group group,
String contentType, byte[] body) throws IOException,
GeneralSecurityException;
/** Creates an anonymous message to a restricted group. */
- Message createAnonymousGroupMessage(MessageId parent, Group group,
+ Message createAnonymousMessage(MessageId parent, Group group,
PrivateKey groupKey, String contentType, byte[] body)
throws IOException, GeneralSecurityException;
diff --git a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
index bf329c80c4..a66b3b6bf2 100644
--- a/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
+++ b/briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
@@ -63,14 +63,14 @@ class MessageFactoryImpl implements MessageFactory {
return createMessage(parent, null, null, null, null, contentType, body);
}
- public Message createAnonymousGroupMessage(MessageId parent, Group group,
+ public Message createAnonymousMessage(MessageId parent, Group group,
String contentType, byte[] body) throws IOException,
GeneralSecurityException {
return createMessage(parent, group, null, null, null, contentType,
body);
}
- public Message createAnonymousGroupMessage(MessageId parent, Group group,
+ public Message createAnonymousMessage(MessageId parent, Group group,
PrivateKey groupKey, String contentType, byte[] body)
throws IOException, GeneralSecurityException {
return createMessage(parent, group, groupKey, null, null, contentType,
@@ -78,8 +78,8 @@ class MessageFactoryImpl implements MessageFactory {
}
public Message createPseudonymousMessage(MessageId parent, Group group,
- Author author, PrivateKey authorKey, String contentType, byte[] body)
- throws IOException, GeneralSecurityException {
+ Author author, PrivateKey authorKey, String contentType,
+ byte[] body) throws IOException, GeneralSecurityException {
return createMessage(parent, group, null, author, authorKey,
contentType, body);
}
diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
index e838923c98..2c400f9ea0 100644
--- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
+++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java
@@ -106,9 +106,9 @@ public class ProtocolIntegrationTest extends BriarTestCase {
authorKeyPair.getPublic().getEncoded());
// Create two messages to each group: one anonymous, one pseudonymous
MessageFactory messageFactory = i.getInstance(MessageFactory.class);
- message = messageFactory.createAnonymousGroupMessage(null, group,
+ message = messageFactory.createAnonymousMessage(null, group,
contentType, messageBody.getBytes("UTF-8"));
- message1 = messageFactory.createAnonymousGroupMessage(null, group1,
+ message1 = messageFactory.createAnonymousMessage(null, group1,
groupKeyPair.getPrivate(), contentType,
messageBody.getBytes("UTF-8"));
message2 = messageFactory.createPseudonymousMessage(null, group,
--
GitLab