Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

Rename object to nameable

Browse Source
This commit is contained in:
Torsten Grote
2018-09-07 11:37:13 -03:00
parent 7e32697696
commit 183fe08565
13 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateRequest.java
View File

@@ -10,21 +10,21 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public class PrivateRequest<O extends Nameable> extends PrivateMessageHeader {
public class PrivateRequest<N extends Nameable> extends PrivateMessageHeader {
private final SessionId sessionId;
private final O object;
private final N nameable;
@Nullable
private final String message;
private final boolean answered, exists;
public PrivateRequest(MessageId messageId, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, O object, @Nullable String message,
SessionId sessionId, N nameable, @Nullable String message,
boolean answered, boolean exists) {
super(messageId, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.object = object;
this.nameable = nameable;
this.message = message;
this.answered = answered;
this.exists = exists;
@@ -34,12 +34,12 @@ public class PrivateRequest<O extends Nameable> extends PrivateMessageHeader {
return sessionId;
}
public O getObject() {
return object;
public N getNameable() {
return nameable;
}
public String getName() {
return object.getName();
return nameable.getName();
}
@Nullable

12
briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateResponse.java
View File

@@ -9,19 +9,19 @@ import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
public abstract class PrivateResponse<O extends Nameable>
public abstract class PrivateResponse<N extends Nameable>
extends PrivateMessageHeader {
private final SessionId sessionId;
private final O object;
private final N nameable;
private final boolean accepted;
public PrivateResponse(MessageId id, GroupId groupId, long time,
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, O object, boolean accepted) {
SessionId sessionId, N nameable, boolean accepted) {
super(id, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.object = object;
this.nameable = nameable;
this.accepted = accepted;
}
@@ -29,8 +29,8 @@ public abstract class PrivateResponse<O extends Nameable>
return sessionId;
}
public O getObject() {
return object;
public N getNameable() {
return nameable;
}
public boolean wasAccepted() {