diff --git a/bdf/Main.java b/bdf/Main.java index 3123b4f..b26092f 100755 --- a/bdf/Main.java +++ b/bdf/Main.java @@ -2,25 +2,32 @@ package bdf; import bdf.file.BdfFileManager; import bdf.types.BdfArray; +import bdf.types.BdfNamedList; import bdf.types.BdfObject; public class Main { public static void main(String[] args) { + BdfFileManager bdf = new BdfFileManager("db/file.db"); - BdfFileManager file = new BdfFileManager("test/test2/db.bdf"); + BdfNamedList bdf_nl = new BdfNamedList(); + bdf_nl.set("greeting", BdfObject.getNew("Hello, World!")); + bdf_nl.set("integer", BdfObject.getNew(21)); + bdf_nl.set("integer", BdfObject.getNew(52)); + BdfArray bdf_array = new BdfArray(); + bdf_array.add(BdfObject.getNew(61)); + bdf_array.add(BdfObject.getNew(42.0d)); + bdf_array.add(BdfObject.getNew(67F)); + bdf_array.add(BdfObject.getNew("hello!")); - file.setArray(new BdfArray()); - file.getArray().add(BdfObject.getNew("Hello")); - System.out.println(file.getArray().get(0).getString()); - file.saveDatabase(); + bdf_nl.set("array", BdfObject.getNew(bdf_array)); + bdf.setNamedList(bdf_nl); + bdf.saveDatabase(); - BdfFileManager file2 = new BdfFileManager("test/test2/db.bdf"); - System.out.println(file2.getArray().get(0).getString()); - + System.out.println(bdf.serializeHumanReadable()); } } diff --git a/bdf/types/BdfArray.java b/bdf/types/BdfArray.java index 3762a62..4625847 100755 --- a/bdf/types/BdfArray.java +++ b/bdf/types/BdfArray.java @@ -55,6 +55,26 @@ public class BdfArray implements IBdfType return serialized; } + @Override + public String serializeHumanReadable() + { + String data = "["; + + for(int i=0;i i+1) + { + data += ", "; + } + } + + return data + "]"; + } + public BdfArray add(BdfObject o) { // Add an element diff --git a/bdf/types/BdfNamedList.java b/bdf/types/BdfNamedList.java index f2b0329..575839d 100755 --- a/bdf/types/BdfNamedList.java +++ b/bdf/types/BdfNamedList.java @@ -1,5 +1,6 @@ package bdf.types; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import bdf.data.BdfDatabase; @@ -72,6 +73,29 @@ public class BdfNamedList implements IBdfType return serialized; } + @Override + public String serializeHumanReadable() + { + String data = "{"; + + for(int i=0;i i+1) + { + data += ", "; + } + } + + return data + "}"; + } + public BdfObject get(String key) { // Get the object to send back @@ -171,6 +195,23 @@ public class BdfNamedList implements IBdfType return false; } + public String[] getKeys() + { + // Get the keys to send back + String[] keys = new String[elements.size()]; + + // Loop over the elements + for(int i=0;i