Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Extract ClientVersion inner class.

Browse Source
This commit is contained in:
akwizgran
2018-04-13 15:45:03 +01:00
parent 85c11f8e1f
commit 1197d65d8d
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersion.java Normal file
View File

@@ -0,0 +1,42 @@
package org.briarproject.bramble.sync;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.ClientId;
import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
class ClientVersion implements Comparable<ClientVersion> {
final ClientId clientId;
final int clientVersion;
ClientVersion(ClientId clientId, int clientVersion) {
this.clientId = clientId;
this.clientVersion = clientVersion;
}
@Override
public boolean equals(Object o) {
if (o instanceof ClientVersion) {
ClientVersion cv = (ClientVersion) o;
return clientId.equals(cv.clientId)
&& clientVersion == cv.clientVersion;
}
return false;
}
@Override
public int hashCode() {
return (clientId.hashCode() << 16) + clientVersion;
}
@Override
public int compareTo(ClientVersion c) {
int compare = clientId.compareTo(c.clientId);
if (compare != 0) return compare;
return clientVersion - c.clientVersion;
}
}

33
bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
View File

@@ -501,39 +501,6 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
}
}
private static class ClientVersion implements Comparable<ClientVersion> {
private final ClientId clientId;
private final int clientVersion;
private ClientVersion(ClientId clientId, int clientVersion) {
this.clientId = clientId;
this.clientVersion = clientVersion;
}
@Override
public boolean equals(Object o) {
if (o instanceof ClientVersion) {
ClientVersion cv = (ClientVersion) o;
return clientId.equals(cv.clientId)
&& clientVersion == cv.clientVersion;
}
return false;
}
@Override
public int hashCode() {
return (clientId.hashCode() << 16) + clientVersion;
}
@Override
public int compareTo(ClientVersion c) {
int compare = clientId.compareTo(c.clientId);
if (compare != 0) return compare;
return clientVersion - c.clientVersion;
}
}
private static class ClientState {
private final ClientVersion version;