diff --git a/briar-api/src/org/briarproject/api/data/BdfDictionary.java b/briar-api/src/org/briarproject/api/data/BdfDictionary.java
index ed0d5b98f95492b6d77668183053afc6ab963096..5fa726fa64b6edf58c248bf7214c458d1400762b 100644
--- a/briar-api/src/org/briarproject/api/data/BdfDictionary.java
+++ b/briar-api/src/org/briarproject/api/data/BdfDictionary.java
@@ -46,7 +46,7 @@ public class BdfDictionary extends Hashtable<String, Object> {
return defaultValue;
}
- public Long getInteger(String key) throws FormatException {
+ public Long getLong(String key) throws FormatException {
Object o = get(key);
if (o instanceof Long) return (Long) o;
if (o instanceof Integer) return ((Integer) o).longValue();
@@ -55,7 +55,7 @@ public class BdfDictionary extends Hashtable<String, Object> {
throw new FormatException();
}
- public Long getInteger(String key, Long defaultValue) {
+ public Long getLong(String key, Long defaultValue) {
Object o = get(key);
if (o instanceof Long) return (Long) o;
if (o instanceof Integer) return ((Integer) o).longValue();
@@ -64,14 +64,14 @@ public class BdfDictionary extends Hashtable<String, Object> {
return defaultValue;
}
- public Double getFloat(String key) throws FormatException {
+ public Double getDouble(String key) throws FormatException {
Object o = get(key);
if (o instanceof Double) return (Double) o;
if (o instanceof Float) return ((Float) o).doubleValue();
throw new FormatException();
}
- public Double getFloat(String key, Double defaultValue) {
+ public Double getDouble(String key, Double defaultValue) {
Object o = get(key);
if (o instanceof Double) return (Double) o;
if (o instanceof Float) return ((Float) o).doubleValue();
diff --git a/briar-api/src/org/briarproject/api/data/BdfList.java b/briar-api/src/org/briarproject/api/data/BdfList.java
index 2d58bcd388c0e33cc8f9b2b0c767efb8437bac04..0cbd0b25292a2b24ff4987066da551524ace2d45 100644
--- a/briar-api/src/org/briarproject/api/data/BdfList.java
+++ b/briar-api/src/org/briarproject/api/data/BdfList.java
@@ -39,7 +39,7 @@ public class BdfList extends Vector<Object> {
return defaultValue;
}
- public Long getInteger(int index) throws FormatException {
+ public Long getLong(int index) throws FormatException {
Object o = get(index);
if (o instanceof Long) return (Long) o;
if (o instanceof Integer) return ((Integer) o).longValue();
@@ -48,7 +48,7 @@ public class BdfList extends Vector<Object> {
throw new FormatException();
}
- public Long getInteger(int index, Long defaultValue) {
+ public Long getLong(int index, Long defaultValue) {
Object o = get(index);
if (o instanceof Long) return (Long) o;
if (o instanceof Integer) return ((Integer) o).longValue();
@@ -57,14 +57,14 @@ public class BdfList extends Vector<Object> {
return defaultValue;
}
- public Double getFloat(int index) throws FormatException {
+ public Double getDouble(int index) throws FormatException {
Object o = get(index);
if (o instanceof Double) return (Double) o;
if (o instanceof Float) return ((Float) o).doubleValue();
throw new FormatException();
}
- public Double getFloat(int index, Double defaultValue) {
+ public Double getDouble(int index, Double defaultValue) {
Object o = get(index);
if (o instanceof Double) return (Double) o;
if (o instanceof Float) return ((Float) o).doubleValue();
diff --git a/briar-core/src/org/briarproject/forum/ForumManagerImpl.java b/briar-core/src/org/briarproject/forum/ForumManagerImpl.java
index 9da89c67191477761cae2178c48ed4afe4fb719c..174f23147b6ab1c2e5a3ef287a2ead6a7a51392e 100644
--- a/briar-core/src/org/briarproject/forum/ForumManagerImpl.java
+++ b/briar-core/src/org/briarproject/forum/ForumManagerImpl.java
@@ -201,7 +201,7 @@ class ForumManagerImpl implements ForumManager {
for (Entry<MessageId, Metadata> e : metadata.entrySet()) {
try {
BdfDictionary d = metadataParser.parse(e.getValue());
- long timestamp = d.getInteger("timestamp");
+ long timestamp = d.getLong("timestamp");
Author author = null;
Author.Status authorStatus = ANONYMOUS;
BdfDictionary d1 = d.getDictionary("author", null);
diff --git a/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java b/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java
index c3ab558dec041169d246ba3a485322438317b856..1224a97e1e4b403e233ac73696c853f8e653c783 100644
--- a/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java
+++ b/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java
@@ -331,7 +331,7 @@ class ForumSharingManagerImpl implements ForumSharingManager, AddContactHook,
for (Entry<MessageId, Metadata> e : metadata.entrySet()) {
BdfDictionary d = metadataParser.parse(e.getValue());
if (d.getBoolean("local") != local) continue;
- long version = d.getInteger("version");
+ long version = d.getLong("version");
if (latest == null || version > latest.version)
latest = new LatestUpdate(e.getKey(), version);
}
@@ -408,7 +408,7 @@ class ForumSharingManagerImpl implements ForumSharingManager, AddContactHook,
throws DbException, FormatException {
Metadata meta = db.getGroupMetadata(txn, contactGroupId);
BdfDictionary d = metadataParser.parse(meta);
- return new ContactId(d.getInteger("contactId").intValue());
+ return new ContactId(d.getLong("contactId").intValue());
}
private Set<GroupId> getVisibleForums(Transaction txn,
diff --git a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java
index ef566f2b16e6c48d831d9166f8cbe282e21d7f88..2d4bf9c95969efc7c4a8d68a73b51e03fb1b02ae 100644
--- a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java
+++ b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java
@@ -132,7 +132,7 @@ class MessagingManagerImpl implements MessagingManager, AddContactHook,
db.endTransaction(txn);
}
BdfDictionary d = metadataParser.parse(meta);
- return new ContactId(d.getInteger("contactId").intValue());
+ return new ContactId(d.getLong("contactId").intValue());
} catch (FormatException e) {
throw new DbException(e);
}
@@ -173,7 +173,7 @@ class MessagingManagerImpl implements MessagingManager, AddContactHook,
if (m == null) continue;
try {
BdfDictionary d = metadataParser.parse(m);
- long timestamp = d.getInteger("timestamp");
+ long timestamp = d.getLong("timestamp");
String contentType = d.getString("contentType");
boolean local = d.getBoolean("local");
boolean read = d.getBoolean("read");
diff --git a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java
index b3db2611c4189027de88153134e6766256451d84..a254551595f6fa387a6e326a173ada60c3be97bc 100644
--- a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java
+++ b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java
@@ -307,7 +307,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
BdfDictionary d = metadataParser.parse(e.getValue());
if (d.getBoolean("local") == local) {
TransportId t = new TransportId(d.getString("transportId"));
- long version = d.getInteger("version");
+ long version = d.getLong("version");
LatestUpdate latest = latestUpdates.get(t);
if (latest == null || version > latest.version)
latestUpdates.put(t, new LatestUpdate(e.getKey(), version));
@@ -324,7 +324,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
BdfDictionary d = metadataParser.parse(e.getValue());
if (d.getString("transportId").equals(t.getString())
&& d.getBoolean("local") == local) {
- long version = d.getInteger("version");
+ long version = d.getLong("version");
if (latest == null || version > latest.version)
latest = new LatestUpdate(e.getKey(), version);
}
diff --git a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
index 0e2c9d8dfae2e9315b74c8e18a29e0a98ad9e501..a7d7f07ba7412a07409097e2f42edc92fa8757e9 100644
--- a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
@@ -35,10 +35,10 @@ public class BdfDictionaryTest extends BriarTestCase {
d.put("bar", (short) 2);
d.put("baz", 3);
d.put("bam", 4L);
- assertEquals(Long.valueOf(1), d.getInteger("foo"));
- assertEquals(Long.valueOf(2), d.getInteger("bar"));
- assertEquals(Long.valueOf(3), d.getInteger("baz"));
- assertEquals(Long.valueOf(4), d.getInteger("bam"));
+ assertEquals(Long.valueOf(1), d.getLong("foo"));
+ assertEquals(Long.valueOf(2), d.getLong("bar"));
+ assertEquals(Long.valueOf(3), d.getLong("baz"));
+ assertEquals(Long.valueOf(4), d.getLong("bam"));
}
@Test
@@ -46,8 +46,8 @@ public class BdfDictionaryTest extends BriarTestCase {
BdfDictionary d = new BdfDictionary();
d.put("foo", 1F);
d.put("bar", 2D);
- assertEquals(Double.valueOf(1), d.getFloat("foo"));
- assertEquals(Double.valueOf(2), d.getFloat("bar"));
+ assertEquals(Double.valueOf(1), d.getDouble("foo"));
+ assertEquals(Double.valueOf(2), d.getDouble("bar"));
}
@Test
diff --git a/briar-tests/src/org/briarproject/data/BdfListTest.java b/briar-tests/src/org/briarproject/data/BdfListTest.java
index b1954e8164aa61ff17b2543617b7d23a0f0056d5..7bb54b3d843914ad5dd97d8c17ea76486dd302da 100644
--- a/briar-tests/src/org/briarproject/data/BdfListTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfListTest.java
@@ -35,10 +35,10 @@ public class BdfListTest extends BriarTestCase {
list.add((short) 2);
list.add(3);
list.add(4L);
- assertEquals(Long.valueOf(1), list.getInteger(0));
- assertEquals(Long.valueOf(2), list.getInteger(1));
- assertEquals(Long.valueOf(3), list.getInteger(2));
- assertEquals(Long.valueOf(4), list.getInteger(3));
+ assertEquals(Long.valueOf(1), list.getLong(0));
+ assertEquals(Long.valueOf(2), list.getLong(1));
+ assertEquals(Long.valueOf(3), list.getLong(2));
+ assertEquals(Long.valueOf(4), list.getLong(3));
}
@Test
@@ -46,8 +46,8 @@ public class BdfListTest extends BriarTestCase {
BdfList list = new BdfList();
list.add(1F);
list.add(2D);
- assertEquals(Double.valueOf(1), list.getFloat(0));
- assertEquals(Double.valueOf(2), list.getFloat(1));
+ assertEquals(Double.valueOf(1), list.getDouble(0));
+ assertEquals(Double.valueOf(2), list.getDouble(1));
}
@Test
diff --git a/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java b/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java
index 1d87d520cdb0347c6c9c86d3cbe5660e1bfa0e9b..5ee9ab8cd700ea2446efb3444026187c4551c353 100644
--- a/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java
+++ b/briar-tests/src/org/briarproject/data/MetadataEncoderParserImplTest.java
@@ -33,7 +33,7 @@ public class MetadataEncoderParserImplTest extends BriarTestCase {
d.put("test", 1337);
Metadata metadata = e.encode(d);
- assertEquals(1337L, (long) p.parse(metadata).getInteger("test", 0L));
+ assertEquals(1337L, (long) p.parse(metadata).getLong("test", 0L));
}
@Test
@@ -42,7 +42,7 @@ public class MetadataEncoderParserImplTest extends BriarTestCase {
Metadata metadata = e.encode(d);
assertEquals(Long.MAX_VALUE,
- (long) p.parse(metadata).getInteger("test", 0L));
+ (long) p.parse(metadata).getLong("test", 0L));
}
@Test
@@ -51,7 +51,7 @@ public class MetadataEncoderParserImplTest extends BriarTestCase {
Metadata metadata = e.encode(d);
assertEquals(Double.MAX_VALUE,
- p.parse(metadata).getFloat("test", 0.0), 0);
+ p.parse(metadata).getDouble("test", 0.0), 0);
}
@Test
@@ -60,7 +60,7 @@ public class MetadataEncoderParserImplTest extends BriarTestCase {
Metadata metadata = e.encode(d);
assertEquals(Float.MIN_NORMAL,
- p.parse(metadata).getFloat("test", 0.0), 0);
+ p.parse(metadata).getDouble("test", 0.0), 0);
}
@Test