aboutsummaryrefslogtreecommitdiff
path: root/src/uk/org/ury/database
diff options
context:
space:
mode:
authorMatt Windsor <mattwindsor@btinternet.com>2011-03-19 14:12:44 +0000
committerMatt Windsor <mattwindsor@btinternet.com>2011-03-19 14:12:44 +0000
commit410219d08abdb859315c4d6d0e0375287d64a88b (patch)
tree3d4610f6cc671147a0aec7bca573a38d6c98b58e /src/uk/org/ury/database
parent2efb758e7c2bd85801c76305161d9d8fa6d2be4b (diff)
Converted protocol to JSON. Now passes its first ever unit test\!
Diffstat (limited to 'src/uk/org/ury/database')
-rw-r--r--src/uk/org/ury/database/DatabaseItem.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/uk/org/ury/database/DatabaseItem.java b/src/uk/org/ury/database/DatabaseItem.java
index b1482ce..a6d929f 100644
--- a/src/uk/org/ury/database/DatabaseItem.java
+++ b/src/uk/org/ury/database/DatabaseItem.java
@@ -1,7 +1,6 @@
package uk.org.ury.database;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
import uk.org.ury.database.exceptions.MissingPropertyException;
@@ -80,18 +79,18 @@ public abstract class DatabaseItem<E, T>
* @return a list of lines representing the response.
*/
- public List<String>
+ public Map<String, String>
asResponse ()
{
// TODO: Fan out implementation details into separate class
- List<String> response = new ArrayList<String> ();
+ Map<String, String> response = new HashMap<String, String> ();
for (E property : properties.keySet ())
{
if (properties.get (property) != null)
- response.add (property.toString () + ": "
- + properties.get (property).toString ());
+ response.put (property.toString (),
+ properties.get (property).toString ());
}
return response;