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

Renamed BdfWriter methods, added support for NULL_VALUE.

Browse Source
This commit is contained in:
akwizgran
2016-02-29 14:18:31 +00:00
parent 3ce62818aa
commit 9e0add7d4c
9 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-core/src/org/briarproject/data/BdfWriterImpl.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import static org.briarproject.api.data.BdfDictionary.NULL_VALUE;
import static org.briarproject.data.Types.DICTIONARY;
import static org.briarproject.data.Types.END;
import static org.briarproject.data.Types.FALSE;
@@ -55,7 +56,7 @@ class BdfWriterImpl implements BdfWriter {
else out.write(FALSE);
}
public void writeInteger(long i) throws IOException {
public void writeLong(long i) throws IOException {
if (i >= Byte.MIN_VALUE && i <= Byte.MAX_VALUE) {
out.write(INT_8);
out.write((byte) i);
@@ -94,7 +95,7 @@ class BdfWriterImpl implements BdfWriter {
out.write((byte) ((i << 56) >> 56));
}
public void writeFloat(double d) throws IOException {
public void writeDouble(double d) throws IOException {
out.write(FLOAT_64);
writeInt64(Double.doubleToRawLongBits(d));
}
@@ -135,14 +136,14 @@ class BdfWriterImpl implements BdfWriter {
}
private void writeObject(Object o) throws IOException {
if (o == null) writeNull();
if (o == null || o == NULL_VALUE) writeNull();
else if (o instanceof Boolean) writeBoolean((Boolean) o);
else if (o instanceof Byte) writeInteger((Byte) o);
else if (o instanceof Short) writeInteger((Short) o);
else if (o instanceof Integer) writeInteger((Integer) o);
else if (o instanceof Long) writeInteger((Long) o);
else if (o instanceof Float) writeFloat((Float) o);
else if (o instanceof Double) writeFloat((Double) o);
else if (o instanceof Byte) writeLong((Byte) o);
else if (o instanceof Short) writeLong((Short) o);
else if (o instanceof Integer) writeLong((Integer) o);
else if (o instanceof Long) writeLong((Long) o);
else if (o instanceof Float) writeDouble((Float) o);
else if (o instanceof Double) writeDouble((Double) o);
else if (o instanceof String) writeString((String) o);
else if (o instanceof byte[]) writeRaw((byte[]) o);
else if (o instanceof Bytes) writeRaw(((Bytes) o).getBytes());

2
briar-core/src/org/briarproject/forum/ForumPostFactoryImpl.java
View File

@@ -77,7 +77,7 @@ class ForumPostFactoryImpl implements ForumPostFactory {
BdfWriter w = bdfWriterFactory.createWriter(out);
w.writeListStart();
w.writeRaw(groupId.getBytes());
w.writeInteger(timestamp);
w.writeLong(timestamp);
if (parent == null) w.writeNull();
else w.writeRaw(parent.getBytes());
writeAuthor(w, author);

2
briar-core/src/org/briarproject/forum/ForumPostValidator.java
View File

@@ -117,7 +117,7 @@ class ForumPostValidator implements MessageValidator {
BdfWriter w = bdfWriterFactory.createWriter(out);
w.writeListStart();
w.writeRaw(m.getGroupId().getBytes());
w.writeInteger(m.getTimestamp());
w.writeLong(m.getTimestamp());
if (parent == null) w.writeNull();
else w.writeRaw(parent.getBytes());
writeAuthor(w, author);

2
briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java
View File

@@ -387,7 +387,7 @@ class ForumSharingManagerImpl implements ForumSharingManager, AddContactHook,
BdfWriter w = bdfWriterFactory.createWriter(out);
try {
w.writeListStart();
w.writeInteger(version);
w.writeLong(version);
w.writeListStart();
for (Forum f : forums) {
w.writeListStart();

2
briar-core/src/org/briarproject/invitation/Connector.java
View File

@@ -196,7 +196,7 @@ abstract class Connector extends Thread {
protected void sendTimestamp(BdfWriter w, long timestamp)
throws IOException {
w.writeInteger(timestamp);
w.writeLong(timestamp);
w.flush();
if (LOG.isLoggable(INFO)) LOG.info(pluginName + " sent timestamp");
}

2
briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java
View File

@@ -288,7 +288,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
w.writeListStart();
w.writeRaw(dev.getBytes());
w.writeString(t.getString());
w.writeInteger(version);
w.writeLong(version);
w.writeDictionary(p);
w.writeListEnd();
} catch (IOException e) {