From bd7cfe95f4d15719f31e17d9aee6830066644948 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sun, 25 Dec 2011 00:05:24 +0700
Subject: Initial commit

---
 src/com/juick/json/Message.java | 70 +++++++++++++++++++++++++++++++++++++++++
 src/com/juick/json/Place.java   | 58 ++++++++++++++++++++++++++++++++++
 src/com/juick/json/User.java    | 38 ++++++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 src/com/juick/json/Message.java
 create mode 100644 src/com/juick/json/Place.java
 create mode 100644 src/com/juick/json/User.java

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
new file mode 100644
index 00000000..83a8624f
--- /dev/null
+++ b/src/com/juick/json/Message.java
@@ -0,0 +1,70 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Message extends com.juick.Message {
+
+    public static Message parseJSON(JSONObject json) throws JSONException {
+        Message jmsg = new Message();
+        jmsg.MID = json.getInt("mid");
+        if (json.has("rid")) {
+            jmsg.RID = json.getInt("rid");
+        }
+        jmsg.Text = json.getString("body").replace("&quot;", "\"");
+        jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
+
+        try {
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            df.setTimeZone(TimeZone.getTimeZone("UTC"));
+            jmsg.Timestamp = df.parse(json.getString("timestamp"));
+        } catch (ParseException e) {
+        }
+
+        if (json.has("tags")) {
+            JSONArray tags = json.getJSONArray("tags");
+            for (int n = 0; n < tags.length(); n++) {
+                jmsg.tags.add(tags.getString(n).replace("&quot;", "\""));
+            }
+        }
+
+        if (json.has("replies")) {
+            jmsg.replies = json.getInt("replies");
+        }
+
+        if (json.has("photo")) {
+            jmsg.Photo = json.getJSONObject("photo").getString("small");
+        }
+        if (json.has("video")) {
+            jmsg.Video = json.getJSONObject("video").getString("mp4");
+        }
+
+        return jmsg;
+    }
+}
diff --git a/src/com/juick/json/Place.java b/src/com/juick/json/Place.java
new file mode 100644
index 00000000..63a5929c
--- /dev/null
+++ b/src/com/juick/json/Place.java
@@ -0,0 +1,58 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Place extends com.juick.Place {
+
+    public static Place parseJSON(JSONObject json) throws JSONException {
+        Place jplace = new Place();
+
+        jplace.pid = json.getInt("pid");
+        jplace.lat = json.getDouble("lat");
+        jplace.lon = json.getDouble("lon");
+        jplace.name = json.getString("name").replace("&quot;", "\"");
+        if (json.has("description")) {
+            jplace.description = json.getString("description").replace("&quot;", "\"");
+        }
+        if (json.has("users")) {
+            jplace.users = json.getInt("users");
+        }
+        if (json.has("messages")) {
+            jplace.messages = json.getInt("messages");
+        }
+        if (json.has("distance")) {
+            jplace.distance = json.getInt("distance");
+        }
+        if (json.has("tags")) {
+            JSONArray tags = json.getJSONArray("tags");
+            for (int n = 0; n < tags.length(); n++) {
+                jplace.tags.add(tags.getString(n).replace("&quot;", "\""));
+            }
+        }
+
+        return jplace;
+    }
+}
diff --git a/src/com/juick/json/User.java b/src/com/juick/json/User.java
new file mode 100644
index 00000000..b4e0e7e8
--- /dev/null
+++ b/src/com/juick/json/User.java
@@ -0,0 +1,38 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class User extends com.juick.User {
+
+    public static User parseJSON(JSONObject json) throws JSONException {
+        User juser = new User();
+        juser.UID = json.getInt("uid");
+        juser.UName = json.getString("uname");
+        if (json.has("fullname")) {
+            juser.FullName = json.getString("fullname");
+        }
+        return juser;
+    }
+}
-- 
cgit v1.2.3


From cbcc5a5e4c1edd4689c756a2548a5087201ee74e Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sun, 22 Jan 2012 23:01:24 +0700
Subject: toJSON()

---
 src/com/juick/json/Message.java | 54 ++++++++++++++++++++++++++++++++++++++---
 src/com/juick/json/Place.java   | 28 ++++++++++++++++++---
 src/com/juick/json/User.java    | 25 ++++++++++++++++---
 3 files changed, 98 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index 83a8624f..da817a01 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -29,10 +29,10 @@ import org.json.JSONObject;
  *
  * @author Ugnich Anton
  */
-public class Message extends com.juick.Message {
+public class Message {
 
-    public static Message parseJSON(JSONObject json) throws JSONException {
-        Message jmsg = new Message();
+    public static com.juick.Message parseJSON(JSONObject json) throws JSONException {
+        com.juick.Message jmsg = new com.juick.Message();
         jmsg.MID = json.getInt("mid");
         if (json.has("rid")) {
             jmsg.RID = json.getInt("rid");
@@ -67,4 +67,52 @@ public class Message extends com.juick.Message {
 
         return jmsg;
     }
+
+    public static JSONObject toJSON(com.juick.Message msg) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (msg.MID > 0) {
+                json.put("mid", msg.MID);
+            }
+            if (msg.RID > 0) {
+                json.put("rid", msg.RID);
+            }
+            if (msg.Text != null) {
+                json.put("body", msg.Text);
+            }
+            if (msg.Timestamp != null) {
+                json.put("timestamp", msg.Timestamp);
+            }
+            if (msg.User != null) {
+                json.put("user", com.juick.json.User.toJSON(msg.User));
+            }
+            if (msg.tags != null && msg.tags.size() > 0) {
+                json.put("tags", new JSONArray(msg.tags));
+            }
+            if (msg.replies > 0) {
+                json.put("replies", msg.replies);
+            }
+            if (msg.place != null) {
+                json.put("place", com.juick.json.Place.toJSON(msg.place));
+            }
+            if (msg.AttachmentType != null) {
+                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
+                if (msg.AttachmentType.equals("jpg")) {
+                    JSONObject photo = new JSONObject();
+                    photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
+                    photo.put("small", "http://i.juick.com/photo-512/" + fname);
+                    photo.put("medium", "http://i.juick.com/photo-1024/" + fname);
+                    json.put("photo", photo);
+                } else {
+                    JSONObject video = new JSONObject();
+                    video.put("mp4", "http://i.juick.com/video/" + fname);
+                    json.put("video", video);
+                }
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
 }
diff --git a/src/com/juick/json/Place.java b/src/com/juick/json/Place.java
index 63a5929c..4e3e5579 100644
--- a/src/com/juick/json/Place.java
+++ b/src/com/juick/json/Place.java
@@ -25,10 +25,10 @@ import org.json.JSONObject;
  *
  * @author Ugnich Anton
  */
-public class Place extends com.juick.Place {
+public class Place {
 
-    public static Place parseJSON(JSONObject json) throws JSONException {
-        Place jplace = new Place();
+    public static com.juick.Place parseJSON(JSONObject json) throws JSONException {
+        com.juick.Place jplace = new com.juick.Place();
 
         jplace.pid = json.getInt("pid");
         jplace.lat = json.getDouble("lat");
@@ -55,4 +55,26 @@ public class Place extends com.juick.Place {
 
         return jplace;
     }
+
+    public static JSONObject toJSON(com.juick.Place place) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (place.pid > 0) {
+                json.put("pid", place.pid);
+            }
+            if (place.lat >= -90 && place.lat <= 90) {
+                json.put("lat", place.lat);
+            }
+            if (place.lon >= -180 && place.lon <= 180) {
+                json.put("lon", place.lon);
+            }
+            if (place.name != null) {
+                json.put("name", place.name);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
 }
diff --git a/src/com/juick/json/User.java b/src/com/juick/json/User.java
index b4e0e7e8..43ee4803 100644
--- a/src/com/juick/json/User.java
+++ b/src/com/juick/json/User.java
@@ -24,10 +24,10 @@ import org.json.JSONObject;
  *
  * @author Ugnich Anton
  */
-public class User extends com.juick.User {
+public class User {
 
-    public static User parseJSON(JSONObject json) throws JSONException {
-        User juser = new User();
+    public static com.juick.User parseJSON(JSONObject json) throws JSONException {
+        com.juick.User juser = new com.juick.User();
         juser.UID = json.getInt("uid");
         juser.UName = json.getString("uname");
         if (json.has("fullname")) {
@@ -35,4 +35,23 @@ public class User extends com.juick.User {
         }
         return juser;
     }
+
+    public static JSONObject toJSON(com.juick.User user) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (user.UID > 0) {
+                json.put("uid", user.UID);
+            }
+            if (user.UName != null) {
+                json.put("uname", user.UName);
+            }
+            if (user.FullName != null) {
+                json.put("fullname", user.FullName);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
 }
-- 
cgit v1.2.3


From c1e53e34484d31584c58fa45c330e770d65879a4 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sun, 4 Nov 2012 22:51:24 +0700
Subject: New Juick Java API

---
 src/com/juick/json/Message.java | 16 ++++++++--------
 src/com/juick/json/Place.java   |  9 ---------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index da817a01..c1beebc4 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -50,12 +50,12 @@ public class Message {
         if (json.has("tags")) {
             JSONArray tags = json.getJSONArray("tags");
             for (int n = 0; n < tags.length(); n++) {
-                jmsg.tags.add(tags.getString(n).replace("&quot;", "\""));
+                jmsg.Tags.add(tags.getString(n).replace("&quot;", "\""));
             }
         }
 
         if (json.has("replies")) {
-            jmsg.replies = json.getInt("replies");
+            jmsg.Replies = json.getInt("replies");
         }
 
         if (json.has("photo")) {
@@ -87,14 +87,14 @@ public class Message {
             if (msg.User != null) {
                 json.put("user", com.juick.json.User.toJSON(msg.User));
             }
-            if (msg.tags != null && msg.tags.size() > 0) {
-                json.put("tags", new JSONArray(msg.tags));
+            if (msg.Tags != null && msg.Tags.size() > 0) {
+                json.put("tags", new JSONArray(msg.Tags));
             }
-            if (msg.replies > 0) {
-                json.put("replies", msg.replies);
+            if (msg.Replies > 0) {
+                json.put("replies", msg.Replies);
             }
-            if (msg.place != null) {
-                json.put("place", com.juick.json.Place.toJSON(msg.place));
+            if (msg.Place != null) {
+                json.put("place", com.juick.json.Place.toJSON(msg.Place));
             }
             if (msg.AttachmentType != null) {
                 String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
diff --git a/src/com/juick/json/Place.java b/src/com/juick/json/Place.java
index 4e3e5579..f195e7d7 100644
--- a/src/com/juick/json/Place.java
+++ b/src/com/juick/json/Place.java
@@ -34,9 +34,6 @@ public class Place {
         jplace.lat = json.getDouble("lat");
         jplace.lon = json.getDouble("lon");
         jplace.name = json.getString("name").replace("&quot;", "\"");
-        if (json.has("description")) {
-            jplace.description = json.getString("description").replace("&quot;", "\"");
-        }
         if (json.has("users")) {
             jplace.users = json.getInt("users");
         }
@@ -46,12 +43,6 @@ public class Place {
         if (json.has("distance")) {
             jplace.distance = json.getInt("distance");
         }
-        if (json.has("tags")) {
-            JSONArray tags = json.getJSONArray("tags");
-            for (int n = 0; n < tags.length(); n++) {
-                jplace.tags.add(tags.getString(n).replace("&quot;", "\""));
-            }
-        }
 
         return jplace;
     }
-- 
cgit v1.2.3


From 40fe707e6566faa02eeba2e8f4830dbbd3992f4a Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Thu, 20 Jun 2013 18:52:48 +0700
Subject: Users.arrayToString

---
 src/com/juick/json/Users.java | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/com/juick/json/Users.java

(limited to 'src')

diff --git a/src/com/juick/json/Users.java b/src/com/juick/json/Users.java
new file mode 100644
index 00000000..eda89ccb
--- /dev/null
+++ b/src/com/juick/json/Users.java
@@ -0,0 +1,31 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.juick.json;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class Users {
+
+    public static String arrayToString(ArrayList<com.juick.User> users) {
+        String json = "[";
+
+        Iterator<com.juick.User> i = users.iterator();
+        while (i.hasNext()) {
+            com.juick.User u = i.next();
+            if (json.length() > 1) {
+                json += ",";
+            }
+            json += "{\"uid\":" + u.UID + ",\"uname\":\"" + u.UName + "\"}";
+        }
+
+        json += "]";
+        return json;
+    }
+}
-- 
cgit v1.2.3


From 8d1d8d845beb6bc6c99d90722169b77c3dff91e7 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Fri, 30 Aug 2013 13:48:38 +0700
Subject: Messages

---
 src/com/juick/json/Message.java  | 12 +++++++-----
 src/com/juick/json/Messages.java | 27 +++++++++++++++++++++++++++
 src/com/juick/json/User.java     |  6 ++++++
 src/com/juick/json/Users.java    |  2 +-
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 src/com/juick/json/Messages.java

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index c1beebc4..18cc375e 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -83,6 +83,8 @@ public class Message {
             }
             if (msg.Timestamp != null) {
                 json.put("timestamp", msg.Timestamp);
+            } else if (msg.TimestampString != null) {
+                json.put("timestamp", msg.TimestampString);
             }
             if (msg.User != null) {
                 json.put("user", com.juick.json.User.toJSON(msg.User));
@@ -98,16 +100,16 @@ public class Message {
             }
             if (msg.AttachmentType != null) {
                 String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
-                if (msg.AttachmentType.equals("jpg")) {
+                if (msg.AttachmentType.equals("mp4")) {
+                    JSONObject video = new JSONObject();
+                    video.put("mp4", "http://i.juick.com/video/" + fname);
+                    json.put("video", video);
+                } else {
                     JSONObject photo = new JSONObject();
                     photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
                     photo.put("small", "http://i.juick.com/photo-512/" + fname);
                     photo.put("medium", "http://i.juick.com/photo-1024/" + fname);
                     json.put("photo", photo);
-                } else {
-                    JSONObject video = new JSONObject();
-                    video.put("mp4", "http://i.juick.com/video/" + fname);
-                    json.put("video", video);
                 }
             }
         } catch (JSONException e) {
diff --git a/src/com/juick/json/Messages.java b/src/com/juick/json/Messages.java
new file mode 100644
index 00000000..a1879b09
--- /dev/null
+++ b/src/com/juick/json/Messages.java
@@ -0,0 +1,27 @@
+package com.juick.json;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class Messages {
+
+    public static String arrayToString(ArrayList<com.juick.Message> messages) {
+        String json = "[";
+
+        Iterator<com.juick.Message> i = messages.iterator();
+        while (i.hasNext()) {
+            com.juick.Message m = i.next();
+            if (json.length() > 1) {
+                json += ",";
+            }
+            json += Message.toJSON(m).toString();
+        }
+
+        json += "]";
+        return json;
+    }
+}
diff --git a/src/com/juick/json/User.java b/src/com/juick/json/User.java
index 43ee4803..dd3143c6 100644
--- a/src/com/juick/json/User.java
+++ b/src/com/juick/json/User.java
@@ -49,6 +49,12 @@ public class User {
             if (user.FullName != null) {
                 json.put("fullname", user.FullName);
             }
+            if (user.JID != null) {
+                json.put("jid", user.JID);
+            }
+            if (user.MessagesCount > 0) {
+                json.put("MessagesCount", user.MessagesCount);
+            }
         } catch (JSONException e) {
         }
 
diff --git a/src/com/juick/json/Users.java b/src/com/juick/json/Users.java
index eda89ccb..0e486f74 100644
--- a/src/com/juick/json/Users.java
+++ b/src/com/juick/json/Users.java
@@ -22,7 +22,7 @@ public class Users {
             if (json.length() > 1) {
                 json += ",";
             }
-            json += "{\"uid\":" + u.UID + ",\"uname\":\"" + u.UName + "\"}";
+            json += User.toJSON(u).toString();
         }
 
         json += "]";
-- 
cgit v1.2.3


From e46184f115a5648bc6ba4a9e74a504d2b6b2f027 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Thu, 19 Sep 2013 14:26:26 +0700
Subject: Message.ReplyTo

---
 src/com/juick/json/Message.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index 18cc375e..70beda88 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -37,6 +37,9 @@ public class Message {
         if (json.has("rid")) {
             jmsg.RID = json.getInt("rid");
         }
+        if (json.has("replyto")) {
+            jmsg.ReplyTo = json.getInt("replyto");
+        }
         jmsg.Text = json.getString("body").replace("&quot;", "\"");
         jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
 
@@ -78,6 +81,9 @@ public class Message {
             if (msg.RID > 0) {
                 json.put("rid", msg.RID);
             }
+            if (msg.ReplyTo > 0) {
+                json.put("replyto", msg.ReplyTo);
+            }
             if (msg.Text != null) {
                 json.put("body", msg.Text);
             }
-- 
cgit v1.2.3


From 8019c7bb6a181d5c36bca40fcbf8b5042d825191 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Tue, 19 Nov 2013 08:46:14 +0700
Subject: bugfix in URL: "photos"

---
 src/com/juick/json/Message.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index 70beda88..c765a5d8 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -113,8 +113,8 @@ public class Message {
                 } else {
                     JSONObject photo = new JSONObject();
                     photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
-                    photo.put("small", "http://i.juick.com/photo-512/" + fname);
-                    photo.put("medium", "http://i.juick.com/photo-1024/" + fname);
+                    photo.put("small", "http://i.juick.com/photos-512/" + fname);
+                    photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
                     json.put("photo", photo);
                 }
             }
-- 
cgit v1.2.3


From 94dba01c5581e43b618d6828ed1b378fd63461a8 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Thu, 19 Dec 2013 01:01:34 +0700
Subject: Message.FriendsOnly, Message.ReadOnly

---
 src/com/juick/json/Message.java | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
index c765a5d8..4ab1901a 100644
--- a/src/com/juick/json/Message.java
+++ b/src/com/juick/json/Message.java
@@ -40,6 +40,10 @@ public class Message {
         if (json.has("replyto")) {
             jmsg.ReplyTo = json.getInt("replyto");
         }
+
+        jmsg.FriendsOnly = json.has("friendsonly");
+        jmsg.ReadOnly = json.has("readonly");
+
         jmsg.Text = json.getString("body").replace("&quot;", "\"");
         jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
 
@@ -64,9 +68,6 @@ public class Message {
         if (json.has("photo")) {
             jmsg.Photo = json.getJSONObject("photo").getString("small");
         }
-        if (json.has("video")) {
-            jmsg.Video = json.getJSONObject("video").getString("mp4");
-        }
 
         return jmsg;
     }
@@ -84,6 +85,12 @@ public class Message {
             if (msg.ReplyTo > 0) {
                 json.put("replyto", msg.ReplyTo);
             }
+            if (msg.FriendsOnly) {
+                json.put("friendsonly", 1);
+            }
+            if (msg.ReadOnly) {
+                json.put("readonly", 1);
+            }
             if (msg.Text != null) {
                 json.put("body", msg.Text);
             }
@@ -106,17 +113,11 @@ public class Message {
             }
             if (msg.AttachmentType != null) {
                 String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
-                if (msg.AttachmentType.equals("mp4")) {
-                    JSONObject video = new JSONObject();
-                    video.put("mp4", "http://i.juick.com/video/" + fname);
-                    json.put("video", video);
-                } else {
-                    JSONObject photo = new JSONObject();
-                    photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
-                    photo.put("small", "http://i.juick.com/photos-512/" + fname);
-                    photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
-                    json.put("photo", photo);
-                }
+                JSONObject photo = new JSONObject();
+                photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
+                photo.put("small", "http://i.juick.com/photos-512/" + fname);
+                photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
+                json.put("photo", photo);
             }
         } catch (JSONException e) {
         }
-- 
cgit v1.2.3


From 5f4602b34ccc3f899edd45e5e541cbb7307c9585 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 31 Oct 2015 01:35:22 +0300
Subject: moved to Gradle

---
 build.gradle                               |    9 +
 build.xml                                  |   74 --
 lib/org.json.jar                           |  Bin 80177 -> 0 bytes
 nbproject/build-impl.xml                   | 1056 ----------------------------
 nbproject/genfiles.properties              |    8 -
 nbproject/project.properties               |   75 --
 nbproject/project.xml                      |   25 -
 src/com/juick/json/Message.java            |  127 ----
 src/com/juick/json/Messages.java           |   27 -
 src/com/juick/json/Place.java              |   71 --
 src/com/juick/json/User.java               |   63 --
 src/com/juick/json/Users.java              |   31 -
 src/main/java/com/juick/json/Message.java  |  127 ++++
 src/main/java/com/juick/json/Messages.java |   27 +
 src/main/java/com/juick/json/Place.java    |   71 ++
 src/main/java/com/juick/json/User.java     |   63 ++
 src/main/java/com/juick/json/Users.java    |   31 +
 17 files changed, 328 insertions(+), 1557 deletions(-)
 create mode 100644 build.gradle
 delete mode 100644 build.xml
 delete mode 100644 lib/org.json.jar
 delete mode 100644 nbproject/build-impl.xml
 delete mode 100644 nbproject/genfiles.properties
 delete mode 100644 nbproject/project.properties
 delete mode 100644 nbproject/project.xml
 delete mode 100644 src/com/juick/json/Message.java
 delete mode 100644 src/com/juick/json/Messages.java
 delete mode 100644 src/com/juick/json/Place.java
 delete mode 100644 src/com/juick/json/User.java
 delete mode 100644 src/com/juick/json/Users.java
 create mode 100644 src/main/java/com/juick/json/Message.java
 create mode 100644 src/main/java/com/juick/json/Messages.java
 create mode 100644 src/main/java/com/juick/json/Place.java
 create mode 100644 src/main/java/com/juick/json/User.java
 create mode 100644 src/main/java/com/juick/json/Users.java

(limited to 'src')

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..483a3727
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: "java"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.json:json:20140107'
+}
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 75e8988b..00000000
--- a/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="com.juick.json" default="default" basedir=".">
-    <description>Builds, tests, and runs the project com.juick.json.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="com.juick.json-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
diff --git a/lib/org.json.jar b/lib/org.json.jar
deleted file mode 100644
index 911ca8f1..00000000
Binary files a/lib/org.json.jar and /dev/null differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
deleted file mode 100644
index 87d29507..00000000
--- a/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="com.juick.json-impl">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class.available"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available+main.class">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
-    <target name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: com.juick.json was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.com_juick}" name="call.subproject"/>
-            <param location="${project.com_juick}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-        </antcall>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <!--
-                =========================
-                APPLET PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <!--
-                =========================
-                TESTS PROFILING  SECTION
-                =========================
-            -->
-    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: com.juick.json was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.com_juick}" name="call.subproject"/>
-            <param location="${project.com_juick}/build.xml" name="call.script"/>
-            <param name="call.target" value="clean"/>
-            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-        </antcall>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <not>
-                <isset property="already.built.${call.subproject}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
deleted file mode 100644
index 225dc8f1..00000000
--- a/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=749f2a7f
-build.xml.script.CRC32=5813f931
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=749f2a7f
-nbproject/build-impl.xml.script.CRC32=9781d004
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index 75ed7362..00000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=com.juick.json
-application.vendor=ugnich
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/com.juick.json.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.org.json.jar=lib/org.json.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${reference.com_juick.jar}:\
-    ${file.reference.org.json.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.com_juick=../com.juick
-reference.com_juick.jar=${project.com_juick}/dist/com.juick.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index e1aed871..00000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>com.juick.json</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>com_juick</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
-    </configuration>
-</project>
diff --git a/src/com/juick/json/Message.java b/src/com/juick/json/Message.java
deleted file mode 100644
index 4ab1901a..00000000
--- a/src/com/juick/json/Message.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Message {
-
-    public static com.juick.Message parseJSON(JSONObject json) throws JSONException {
-        com.juick.Message jmsg = new com.juick.Message();
-        jmsg.MID = json.getInt("mid");
-        if (json.has("rid")) {
-            jmsg.RID = json.getInt("rid");
-        }
-        if (json.has("replyto")) {
-            jmsg.ReplyTo = json.getInt("replyto");
-        }
-
-        jmsg.FriendsOnly = json.has("friendsonly");
-        jmsg.ReadOnly = json.has("readonly");
-
-        jmsg.Text = json.getString("body").replace("&quot;", "\"");
-        jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
-
-        try {
-            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            df.setTimeZone(TimeZone.getTimeZone("UTC"));
-            jmsg.Timestamp = df.parse(json.getString("timestamp"));
-        } catch (ParseException e) {
-        }
-
-        if (json.has("tags")) {
-            JSONArray tags = json.getJSONArray("tags");
-            for (int n = 0; n < tags.length(); n++) {
-                jmsg.Tags.add(tags.getString(n).replace("&quot;", "\""));
-            }
-        }
-
-        if (json.has("replies")) {
-            jmsg.Replies = json.getInt("replies");
-        }
-
-        if (json.has("photo")) {
-            jmsg.Photo = json.getJSONObject("photo").getString("small");
-        }
-
-        return jmsg;
-    }
-
-    public static JSONObject toJSON(com.juick.Message msg) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (msg.MID > 0) {
-                json.put("mid", msg.MID);
-            }
-            if (msg.RID > 0) {
-                json.put("rid", msg.RID);
-            }
-            if (msg.ReplyTo > 0) {
-                json.put("replyto", msg.ReplyTo);
-            }
-            if (msg.FriendsOnly) {
-                json.put("friendsonly", 1);
-            }
-            if (msg.ReadOnly) {
-                json.put("readonly", 1);
-            }
-            if (msg.Text != null) {
-                json.put("body", msg.Text);
-            }
-            if (msg.Timestamp != null) {
-                json.put("timestamp", msg.Timestamp);
-            } else if (msg.TimestampString != null) {
-                json.put("timestamp", msg.TimestampString);
-            }
-            if (msg.User != null) {
-                json.put("user", com.juick.json.User.toJSON(msg.User));
-            }
-            if (msg.Tags != null && msg.Tags.size() > 0) {
-                json.put("tags", new JSONArray(msg.Tags));
-            }
-            if (msg.Replies > 0) {
-                json.put("replies", msg.Replies);
-            }
-            if (msg.Place != null) {
-                json.put("place", com.juick.json.Place.toJSON(msg.Place));
-            }
-            if (msg.AttachmentType != null) {
-                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
-                JSONObject photo = new JSONObject();
-                photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
-                photo.put("small", "http://i.juick.com/photos-512/" + fname);
-                photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
-                json.put("photo", photo);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/com/juick/json/Messages.java b/src/com/juick/json/Messages.java
deleted file mode 100644
index a1879b09..00000000
--- a/src/com/juick/json/Messages.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.juick.json;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class Messages {
-
-    public static String arrayToString(ArrayList<com.juick.Message> messages) {
-        String json = "[";
-
-        Iterator<com.juick.Message> i = messages.iterator();
-        while (i.hasNext()) {
-            com.juick.Message m = i.next();
-            if (json.length() > 1) {
-                json += ",";
-            }
-            json += Message.toJSON(m).toString();
-        }
-
-        json += "]";
-        return json;
-    }
-}
diff --git a/src/com/juick/json/Place.java b/src/com/juick/json/Place.java
deleted file mode 100644
index f195e7d7..00000000
--- a/src/com/juick/json/Place.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Place {
-
-    public static com.juick.Place parseJSON(JSONObject json) throws JSONException {
-        com.juick.Place jplace = new com.juick.Place();
-
-        jplace.pid = json.getInt("pid");
-        jplace.lat = json.getDouble("lat");
-        jplace.lon = json.getDouble("lon");
-        jplace.name = json.getString("name").replace("&quot;", "\"");
-        if (json.has("users")) {
-            jplace.users = json.getInt("users");
-        }
-        if (json.has("messages")) {
-            jplace.messages = json.getInt("messages");
-        }
-        if (json.has("distance")) {
-            jplace.distance = json.getInt("distance");
-        }
-
-        return jplace;
-    }
-
-    public static JSONObject toJSON(com.juick.Place place) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (place.pid > 0) {
-                json.put("pid", place.pid);
-            }
-            if (place.lat >= -90 && place.lat <= 90) {
-                json.put("lat", place.lat);
-            }
-            if (place.lon >= -180 && place.lon <= 180) {
-                json.put("lon", place.lon);
-            }
-            if (place.name != null) {
-                json.put("name", place.name);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/com/juick/json/User.java b/src/com/juick/json/User.java
deleted file mode 100644
index dd3143c6..00000000
--- a/src/com/juick/json/User.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class User {
-
-    public static com.juick.User parseJSON(JSONObject json) throws JSONException {
-        com.juick.User juser = new com.juick.User();
-        juser.UID = json.getInt("uid");
-        juser.UName = json.getString("uname");
-        if (json.has("fullname")) {
-            juser.FullName = json.getString("fullname");
-        }
-        return juser;
-    }
-
-    public static JSONObject toJSON(com.juick.User user) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (user.UID > 0) {
-                json.put("uid", user.UID);
-            }
-            if (user.UName != null) {
-                json.put("uname", user.UName);
-            }
-            if (user.FullName != null) {
-                json.put("fullname", user.FullName);
-            }
-            if (user.JID != null) {
-                json.put("jid", user.JID);
-            }
-            if (user.MessagesCount > 0) {
-                json.put("MessagesCount", user.MessagesCount);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/com/juick/json/Users.java b/src/com/juick/json/Users.java
deleted file mode 100644
index 0e486f74..00000000
--- a/src/com/juick/json/Users.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.json;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class Users {
-
-    public static String arrayToString(ArrayList<com.juick.User> users) {
-        String json = "[";
-
-        Iterator<com.juick.User> i = users.iterator();
-        while (i.hasNext()) {
-            com.juick.User u = i.next();
-            if (json.length() > 1) {
-                json += ",";
-            }
-            json += User.toJSON(u).toString();
-        }
-
-        json += "]";
-        return json;
-    }
-}
diff --git a/src/main/java/com/juick/json/Message.java b/src/main/java/com/juick/json/Message.java
new file mode 100644
index 00000000..4ab1901a
--- /dev/null
+++ b/src/main/java/com/juick/json/Message.java
@@ -0,0 +1,127 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Message {
+
+    public static com.juick.Message parseJSON(JSONObject json) throws JSONException {
+        com.juick.Message jmsg = new com.juick.Message();
+        jmsg.MID = json.getInt("mid");
+        if (json.has("rid")) {
+            jmsg.RID = json.getInt("rid");
+        }
+        if (json.has("replyto")) {
+            jmsg.ReplyTo = json.getInt("replyto");
+        }
+
+        jmsg.FriendsOnly = json.has("friendsonly");
+        jmsg.ReadOnly = json.has("readonly");
+
+        jmsg.Text = json.getString("body").replace("&quot;", "\"");
+        jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
+
+        try {
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            df.setTimeZone(TimeZone.getTimeZone("UTC"));
+            jmsg.Timestamp = df.parse(json.getString("timestamp"));
+        } catch (ParseException e) {
+        }
+
+        if (json.has("tags")) {
+            JSONArray tags = json.getJSONArray("tags");
+            for (int n = 0; n < tags.length(); n++) {
+                jmsg.Tags.add(tags.getString(n).replace("&quot;", "\""));
+            }
+        }
+
+        if (json.has("replies")) {
+            jmsg.Replies = json.getInt("replies");
+        }
+
+        if (json.has("photo")) {
+            jmsg.Photo = json.getJSONObject("photo").getString("small");
+        }
+
+        return jmsg;
+    }
+
+    public static JSONObject toJSON(com.juick.Message msg) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (msg.MID > 0) {
+                json.put("mid", msg.MID);
+            }
+            if (msg.RID > 0) {
+                json.put("rid", msg.RID);
+            }
+            if (msg.ReplyTo > 0) {
+                json.put("replyto", msg.ReplyTo);
+            }
+            if (msg.FriendsOnly) {
+                json.put("friendsonly", 1);
+            }
+            if (msg.ReadOnly) {
+                json.put("readonly", 1);
+            }
+            if (msg.Text != null) {
+                json.put("body", msg.Text);
+            }
+            if (msg.Timestamp != null) {
+                json.put("timestamp", msg.Timestamp);
+            } else if (msg.TimestampString != null) {
+                json.put("timestamp", msg.TimestampString);
+            }
+            if (msg.User != null) {
+                json.put("user", com.juick.json.User.toJSON(msg.User));
+            }
+            if (msg.Tags != null && msg.Tags.size() > 0) {
+                json.put("tags", new JSONArray(msg.Tags));
+            }
+            if (msg.Replies > 0) {
+                json.put("replies", msg.Replies);
+            }
+            if (msg.Place != null) {
+                json.put("place", com.juick.json.Place.toJSON(msg.Place));
+            }
+            if (msg.AttachmentType != null) {
+                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
+                JSONObject photo = new JSONObject();
+                photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
+                photo.put("small", "http://i.juick.com/photos-512/" + fname);
+                photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
+                json.put("photo", photo);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Messages.java b/src/main/java/com/juick/json/Messages.java
new file mode 100644
index 00000000..a1879b09
--- /dev/null
+++ b/src/main/java/com/juick/json/Messages.java
@@ -0,0 +1,27 @@
+package com.juick.json;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class Messages {
+
+    public static String arrayToString(ArrayList<com.juick.Message> messages) {
+        String json = "[";
+
+        Iterator<com.juick.Message> i = messages.iterator();
+        while (i.hasNext()) {
+            com.juick.Message m = i.next();
+            if (json.length() > 1) {
+                json += ",";
+            }
+            json += Message.toJSON(m).toString();
+        }
+
+        json += "]";
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Place.java b/src/main/java/com/juick/json/Place.java
new file mode 100644
index 00000000..f195e7d7
--- /dev/null
+++ b/src/main/java/com/juick/json/Place.java
@@ -0,0 +1,71 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Place {
+
+    public static com.juick.Place parseJSON(JSONObject json) throws JSONException {
+        com.juick.Place jplace = new com.juick.Place();
+
+        jplace.pid = json.getInt("pid");
+        jplace.lat = json.getDouble("lat");
+        jplace.lon = json.getDouble("lon");
+        jplace.name = json.getString("name").replace("&quot;", "\"");
+        if (json.has("users")) {
+            jplace.users = json.getInt("users");
+        }
+        if (json.has("messages")) {
+            jplace.messages = json.getInt("messages");
+        }
+        if (json.has("distance")) {
+            jplace.distance = json.getInt("distance");
+        }
+
+        return jplace;
+    }
+
+    public static JSONObject toJSON(com.juick.Place place) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (place.pid > 0) {
+                json.put("pid", place.pid);
+            }
+            if (place.lat >= -90 && place.lat <= 90) {
+                json.put("lat", place.lat);
+            }
+            if (place.lon >= -180 && place.lon <= 180) {
+                json.put("lon", place.lon);
+            }
+            if (place.name != null) {
+                json.put("name", place.name);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/User.java b/src/main/java/com/juick/json/User.java
new file mode 100644
index 00000000..dd3143c6
--- /dev/null
+++ b/src/main/java/com/juick/json/User.java
@@ -0,0 +1,63 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class User {
+
+    public static com.juick.User parseJSON(JSONObject json) throws JSONException {
+        com.juick.User juser = new com.juick.User();
+        juser.UID = json.getInt("uid");
+        juser.UName = json.getString("uname");
+        if (json.has("fullname")) {
+            juser.FullName = json.getString("fullname");
+        }
+        return juser;
+    }
+
+    public static JSONObject toJSON(com.juick.User user) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (user.UID > 0) {
+                json.put("uid", user.UID);
+            }
+            if (user.UName != null) {
+                json.put("uname", user.UName);
+            }
+            if (user.FullName != null) {
+                json.put("fullname", user.FullName);
+            }
+            if (user.JID != null) {
+                json.put("jid", user.JID);
+            }
+            if (user.MessagesCount > 0) {
+                json.put("MessagesCount", user.MessagesCount);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Users.java b/src/main/java/com/juick/json/Users.java
new file mode 100644
index 00000000..0e486f74
--- /dev/null
+++ b/src/main/java/com/juick/json/Users.java
@@ -0,0 +1,31 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.juick.json;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ *
+ * @author ugnich
+ */
+public class Users {
+
+    public static String arrayToString(ArrayList<com.juick.User> users) {
+        String json = "[";
+
+        Iterator<com.juick.User> i = users.iterator();
+        while (i.hasNext()) {
+            com.juick.User u = i.next();
+            if (json.length() > 1) {
+                json += ",";
+            }
+            json += User.toJSON(u).toString();
+        }
+
+        json += "]";
+        return json;
+    }
+}
-- 
cgit v1.2.3


From 655b821e274ca4be078389475a8bb33139c55a4f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 4 Nov 2015 15:24:53 +0300
Subject: refactoring

---
 build.gradle                                       |   2 +-
 src/main/java/com/juick/json/JSONSerializer.java   |  53 ++++++++
 src/main/java/com/juick/json/Message.java          | 127 --------------------
 .../java/com/juick/json/MessageSerializer.java     | 133 +++++++++++++++++++++
 src/main/java/com/juick/json/Messages.java         |  27 -----
 src/main/java/com/juick/json/Place.java            |  71 -----------
 src/main/java/com/juick/json/PlaceSerializer.java  |  73 +++++++++++
 src/main/java/com/juick/json/User.java             |  63 ----------
 src/main/java/com/juick/json/UserSerializer.java   |  66 ++++++++++
 src/main/java/com/juick/json/Users.java            |  31 -----
 10 files changed, 326 insertions(+), 320 deletions(-)
 create mode 100644 src/main/java/com/juick/json/JSONSerializer.java
 delete mode 100644 src/main/java/com/juick/json/Message.java
 create mode 100644 src/main/java/com/juick/json/MessageSerializer.java
 delete mode 100644 src/main/java/com/juick/json/Messages.java
 delete mode 100644 src/main/java/com/juick/json/Place.java
 create mode 100644 src/main/java/com/juick/json/PlaceSerializer.java
 delete mode 100644 src/main/java/com/juick/json/User.java
 create mode 100644 src/main/java/com/juick/json/UserSerializer.java
 delete mode 100644 src/main/java/com/juick/json/Users.java

(limited to 'src')

diff --git a/build.gradle b/build.gradle
index 483a3727..a8ba383f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,5 +5,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.json:json:20140107'
+    compile 'org.json:json:20150729'
 }
diff --git a/src/main/java/com/juick/json/JSONSerializer.java b/src/main/java/com/juick/json/JSONSerializer.java
new file mode 100644
index 00000000..8ac72cb0
--- /dev/null
+++ b/src/main/java/com/juick/json/JSONSerializer.java
@@ -0,0 +1,53 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.juick.json;
+
+import java.util.Iterator;
+import java.util.List;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author vt
+ * @param <T>
+ */
+public abstract class JSONSerializer<T> {
+
+    /**
+     *
+     * @param json
+     * @return
+     */
+    public abstract T deserialize(JSONObject json);
+    
+    /**
+     *
+     * @param obj
+     * @return
+     */
+    public abstract JSONObject serialize(T obj);
+    
+    /**
+     *
+     * @param objs
+     * @return
+     */
+    public String serializeList(List<T> objs) {
+        String json = "[";
+        
+        Iterator<T> i = objs.iterator();
+        while (i.hasNext()) {
+            T m = i.next();
+            if (json.length() > 1) {
+                json += ",";
+            }
+            json += serialize(m).toString();
+        }
+
+        json += "]";
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Message.java b/src/main/java/com/juick/json/Message.java
deleted file mode 100644
index 4ab1901a..00000000
--- a/src/main/java/com/juick/json/Message.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Message {
-
-    public static com.juick.Message parseJSON(JSONObject json) throws JSONException {
-        com.juick.Message jmsg = new com.juick.Message();
-        jmsg.MID = json.getInt("mid");
-        if (json.has("rid")) {
-            jmsg.RID = json.getInt("rid");
-        }
-        if (json.has("replyto")) {
-            jmsg.ReplyTo = json.getInt("replyto");
-        }
-
-        jmsg.FriendsOnly = json.has("friendsonly");
-        jmsg.ReadOnly = json.has("readonly");
-
-        jmsg.Text = json.getString("body").replace("&quot;", "\"");
-        jmsg.User = com.juick.json.User.parseJSON(json.getJSONObject("user"));
-
-        try {
-            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            df.setTimeZone(TimeZone.getTimeZone("UTC"));
-            jmsg.Timestamp = df.parse(json.getString("timestamp"));
-        } catch (ParseException e) {
-        }
-
-        if (json.has("tags")) {
-            JSONArray tags = json.getJSONArray("tags");
-            for (int n = 0; n < tags.length(); n++) {
-                jmsg.Tags.add(tags.getString(n).replace("&quot;", "\""));
-            }
-        }
-
-        if (json.has("replies")) {
-            jmsg.Replies = json.getInt("replies");
-        }
-
-        if (json.has("photo")) {
-            jmsg.Photo = json.getJSONObject("photo").getString("small");
-        }
-
-        return jmsg;
-    }
-
-    public static JSONObject toJSON(com.juick.Message msg) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (msg.MID > 0) {
-                json.put("mid", msg.MID);
-            }
-            if (msg.RID > 0) {
-                json.put("rid", msg.RID);
-            }
-            if (msg.ReplyTo > 0) {
-                json.put("replyto", msg.ReplyTo);
-            }
-            if (msg.FriendsOnly) {
-                json.put("friendsonly", 1);
-            }
-            if (msg.ReadOnly) {
-                json.put("readonly", 1);
-            }
-            if (msg.Text != null) {
-                json.put("body", msg.Text);
-            }
-            if (msg.Timestamp != null) {
-                json.put("timestamp", msg.Timestamp);
-            } else if (msg.TimestampString != null) {
-                json.put("timestamp", msg.TimestampString);
-            }
-            if (msg.User != null) {
-                json.put("user", com.juick.json.User.toJSON(msg.User));
-            }
-            if (msg.Tags != null && msg.Tags.size() > 0) {
-                json.put("tags", new JSONArray(msg.Tags));
-            }
-            if (msg.Replies > 0) {
-                json.put("replies", msg.Replies);
-            }
-            if (msg.Place != null) {
-                json.put("place", com.juick.json.Place.toJSON(msg.Place));
-            }
-            if (msg.AttachmentType != null) {
-                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
-                JSONObject photo = new JSONObject();
-                photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
-                photo.put("small", "http://i.juick.com/photos-512/" + fname);
-                photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
-                json.put("photo", photo);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
new file mode 100644
index 00000000..0879f13a
--- /dev/null
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -0,0 +1,133 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import com.juick.Message;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class MessageSerializer extends JSONSerializer<Message> {
+    
+    UserSerializer userSerializer = new UserSerializer();
+    PlaceSerializer placeSerializer = new PlaceSerializer();
+
+    @Override
+    public Message deserialize(JSONObject json) throws JSONException {
+        com.juick.Message jmsg = new com.juick.Message();
+        jmsg.MID = json.getInt("mid");
+        if (json.has("rid")) {
+            jmsg.RID = json.getInt("rid");
+        }
+        if (json.has("replyto")) {
+            jmsg.ReplyTo = json.getInt("replyto");
+        }
+
+        jmsg.FriendsOnly = json.has("friendsonly");
+        jmsg.ReadOnly = json.has("readonly");
+
+        jmsg.Text = json.getString("body").replace("&quot;", "\"");
+        jmsg.User = userSerializer.deserialize(json.getJSONObject("user"));
+
+        try {
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            df.setTimeZone(TimeZone.getTimeZone("UTC"));
+            jmsg.Timestamp = df.parse(json.getString("timestamp"));
+        } catch (ParseException e) {
+        }
+
+        if (json.has("tags")) {
+            JSONArray tags = json.getJSONArray("tags");
+            for (int n = 0; n < tags.length(); n++) {
+                jmsg.Tags.add(tags.getString(n).replace("&quot;", "\""));
+            }
+        }
+
+        if (json.has("replies")) {
+            jmsg.Replies = json.getInt("replies");
+        }
+
+        if (json.has("photo")) {
+            jmsg.Photo = json.getJSONObject("photo").getString("small");
+        }
+
+        return jmsg;
+    }
+
+    @Override
+    public JSONObject serialize(Message msg) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (msg.MID > 0) {
+                json.put("mid", msg.MID);
+            }
+            if (msg.RID > 0) {
+                json.put("rid", msg.RID);
+            }
+            if (msg.ReplyTo > 0) {
+                json.put("replyto", msg.ReplyTo);
+            }
+            if (msg.FriendsOnly) {
+                json.put("friendsonly", 1);
+            }
+            if (msg.ReadOnly) {
+                json.put("readonly", 1);
+            }
+            if (msg.Text != null) {
+                json.put("body", msg.Text);
+            }
+            if (msg.Timestamp != null) {
+                json.put("timestamp", msg.Timestamp);
+            } else if (msg.TimestampString != null) {
+                json.put("timestamp", msg.TimestampString);
+            }
+            if (msg.User != null) {
+                json.put("user", userSerializer.serialize(msg.User));
+            }
+            if (msg.Tags != null && msg.Tags.size() > 0) {
+                json.put("tags", new JSONArray(msg.Tags));
+            }
+            if (msg.Replies > 0) {
+                json.put("replies", msg.Replies);
+            }
+            if (msg.Place != null) {
+                json.put("place", placeSerializer.serialize(msg.Place));
+            }
+            if (msg.AttachmentType != null) {
+                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
+                JSONObject photo = new JSONObject();
+                photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
+                photo.put("small", "http://i.juick.com/photos-512/" + fname);
+                photo.put("medium", "http://i.juick.com/photos-1024/" + fname);
+                json.put("photo", photo);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Messages.java b/src/main/java/com/juick/json/Messages.java
deleted file mode 100644
index a1879b09..00000000
--- a/src/main/java/com/juick/json/Messages.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.juick.json;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class Messages {
-
-    public static String arrayToString(ArrayList<com.juick.Message> messages) {
-        String json = "[";
-
-        Iterator<com.juick.Message> i = messages.iterator();
-        while (i.hasNext()) {
-            com.juick.Message m = i.next();
-            if (json.length() > 1) {
-                json += ",";
-            }
-            json += Message.toJSON(m).toString();
-        }
-
-        json += "]";
-        return json;
-    }
-}
diff --git a/src/main/java/com/juick/json/Place.java b/src/main/java/com/juick/json/Place.java
deleted file mode 100644
index f195e7d7..00000000
--- a/src/main/java/com/juick/json/Place.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Place {
-
-    public static com.juick.Place parseJSON(JSONObject json) throws JSONException {
-        com.juick.Place jplace = new com.juick.Place();
-
-        jplace.pid = json.getInt("pid");
-        jplace.lat = json.getDouble("lat");
-        jplace.lon = json.getDouble("lon");
-        jplace.name = json.getString("name").replace("&quot;", "\"");
-        if (json.has("users")) {
-            jplace.users = json.getInt("users");
-        }
-        if (json.has("messages")) {
-            jplace.messages = json.getInt("messages");
-        }
-        if (json.has("distance")) {
-            jplace.distance = json.getInt("distance");
-        }
-
-        return jplace;
-    }
-
-    public static JSONObject toJSON(com.juick.Place place) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (place.pid > 0) {
-                json.put("pid", place.pid);
-            }
-            if (place.lat >= -90 && place.lat <= 90) {
-                json.put("lat", place.lat);
-            }
-            if (place.lon >= -180 && place.lon <= 180) {
-                json.put("lon", place.lon);
-            }
-            if (place.name != null) {
-                json.put("name", place.name);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/main/java/com/juick/json/PlaceSerializer.java b/src/main/java/com/juick/json/PlaceSerializer.java
new file mode 100644
index 00000000..f433f7f0
--- /dev/null
+++ b/src/main/java/com/juick/json/PlaceSerializer.java
@@ -0,0 +1,73 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import com.juick.Place;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class PlaceSerializer extends JSONSerializer<Place> {
+
+    @Override
+    public Place deserialize(JSONObject json) throws JSONException {
+        Place jplace = new Place();
+
+        jplace.pid = json.getInt("pid");
+        jplace.lat = json.getDouble("lat");
+        jplace.lon = json.getDouble("lon");
+        jplace.name = json.getString("name").replace("&quot;", "\"");
+        if (json.has("users")) {
+            jplace.users = json.getInt("users");
+        }
+        if (json.has("messages")) {
+            jplace.messages = json.getInt("messages");
+        }
+        if (json.has("distance")) {
+            jplace.distance = json.getInt("distance");
+        }
+
+        return jplace;
+    }
+
+    @Override
+    public JSONObject serialize(Place place) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (place.pid > 0) {
+                json.put("pid", place.pid);
+            }
+            if (place.lat >= -90 && place.lat <= 90) {
+                json.put("lat", place.lat);
+            }
+            if (place.lon >= -180 && place.lon <= 180) {
+                json.put("lon", place.lon);
+            }
+            if (place.name != null) {
+                json.put("name", place.name);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/User.java b/src/main/java/com/juick/json/User.java
deleted file mode 100644
index dd3143c6..00000000
--- a/src/main/java/com/juick/json/User.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.json;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class User {
-
-    public static com.juick.User parseJSON(JSONObject json) throws JSONException {
-        com.juick.User juser = new com.juick.User();
-        juser.UID = json.getInt("uid");
-        juser.UName = json.getString("uname");
-        if (json.has("fullname")) {
-            juser.FullName = json.getString("fullname");
-        }
-        return juser;
-    }
-
-    public static JSONObject toJSON(com.juick.User user) {
-        JSONObject json = new JSONObject();
-
-        try {
-            if (user.UID > 0) {
-                json.put("uid", user.UID);
-            }
-            if (user.UName != null) {
-                json.put("uname", user.UName);
-            }
-            if (user.FullName != null) {
-                json.put("fullname", user.FullName);
-            }
-            if (user.JID != null) {
-                json.put("jid", user.JID);
-            }
-            if (user.MessagesCount > 0) {
-                json.put("MessagesCount", user.MessagesCount);
-            }
-        } catch (JSONException e) {
-        }
-
-        return json;
-    }
-}
diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
new file mode 100644
index 00000000..07f87616
--- /dev/null
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -0,0 +1,66 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.json;
+
+import com.juick.User;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class UserSerializer extends JSONSerializer<User> {
+
+    @Override
+    public User deserialize(JSONObject json) throws JSONException {
+        User juser = new User();
+        juser.UID = json.getInt("uid");
+        juser.UName = json.getString("uname");
+        if (json.has("fullname")) {
+            juser.FullName = json.getString("fullname");
+        }
+        return juser;
+    }
+
+    @Override
+    public JSONObject serialize(User user) {
+        JSONObject json = new JSONObject();
+
+        try {
+            if (user.UID > 0) {
+                json.put("uid", user.UID);
+            }
+            if (user.UName != null) {
+                json.put("uname", user.UName);
+            }
+            if (user.FullName != null) {
+                json.put("fullname", user.FullName);
+            }
+            if (user.JID != null) {
+                json.put("jid", user.JID);
+            }
+            if (user.MessagesCount > 0) {
+                json.put("MessagesCount", user.MessagesCount);
+            }
+        } catch (JSONException e) {
+        }
+
+        return json;
+    }
+}
diff --git a/src/main/java/com/juick/json/Users.java b/src/main/java/com/juick/json/Users.java
deleted file mode 100644
index 0e486f74..00000000
--- a/src/main/java/com/juick/json/Users.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.json;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author ugnich
- */
-public class Users {
-
-    public static String arrayToString(ArrayList<com.juick.User> users) {
-        String json = "[";
-
-        Iterator<com.juick.User> i = users.iterator();
-        while (i.hasNext()) {
-            com.juick.User u = i.next();
-            if (json.length() > 1) {
-                json += ",";
-            }
-            json += User.toJSON(u).toString();
-        }
-
-        json += "]";
-        return json;
-    }
-}
-- 
cgit v1.2.3


From 331363c89936be9df126d10e16107b99a18877d1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 10 Jan 2016 19:58:19 +0300
Subject: refactoring

---
 .../java/com/juick/json/MessageSerializer.java     | 20 ++++++++++----------
 src/main/java/com/juick/json/UserSerializer.java   | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
index 0879f13a..85986415 100644
--- a/src/main/java/com/juick/json/MessageSerializer.java
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -38,9 +38,9 @@ public class MessageSerializer extends JSONSerializer<Message> {
     @Override
     public Message deserialize(JSONObject json) throws JSONException {
         com.juick.Message jmsg = new com.juick.Message();
-        jmsg.MID = json.getInt("mid");
+        jmsg.setMID(json.getInt("mid"));
         if (json.has("rid")) {
-            jmsg.RID = json.getInt("rid");
+            jmsg.setRID(json.getInt("rid"));
         }
         if (json.has("replyto")) {
             jmsg.ReplyTo = json.getInt("replyto");
@@ -50,7 +50,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
         jmsg.ReadOnly = json.has("readonly");
 
         jmsg.Text = json.getString("body").replace("&quot;", "\"");
-        jmsg.User = userSerializer.deserialize(json.getJSONObject("user"));
+        jmsg.setUser(userSerializer.deserialize(json.getJSONObject("user")));
 
         try {
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -82,11 +82,11 @@ public class MessageSerializer extends JSONSerializer<Message> {
         JSONObject json = new JSONObject();
 
         try {
-            if (msg.MID > 0) {
-                json.put("mid", msg.MID);
+            if (msg.getMID() > 0) {
+                json.put("mid", msg.getMID());
             }
-            if (msg.RID > 0) {
-                json.put("rid", msg.RID);
+            if (msg.getRID() > 0) {
+                json.put("rid", msg.getRID());
             }
             if (msg.ReplyTo > 0) {
                 json.put("replyto", msg.ReplyTo);
@@ -105,8 +105,8 @@ public class MessageSerializer extends JSONSerializer<Message> {
             } else if (msg.TimestampString != null) {
                 json.put("timestamp", msg.TimestampString);
             }
-            if (msg.User != null) {
-                json.put("user", userSerializer.serialize(msg.User));
+            if (msg.getUser() != null) {
+                json.put("user", userSerializer.serialize(msg.getUser()));
             }
             if (msg.Tags != null && msg.Tags.size() > 0) {
                 json.put("tags", new JSONArray(msg.Tags));
@@ -118,7 +118,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
                 json.put("place", placeSerializer.serialize(msg.Place));
             }
             if (msg.AttachmentType != null) {
-                String fname = msg.MID + (msg.RID > 0 ? "-" + msg.RID : "") + "." + msg.AttachmentType;
+                String fname = msg.getMID() + (msg.getRID() > 0 ? "-" + msg.getRID() : "") + "." + msg.AttachmentType;
                 JSONObject photo = new JSONObject();
                 photo.put("thumbnail", "http://i.juick.com/ps/" + fname);
                 photo.put("small", "http://i.juick.com/photos-512/" + fname);
diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
index 07f87616..4485812a 100644
--- a/src/main/java/com/juick/json/UserSerializer.java
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -30,10 +30,10 @@ public class UserSerializer extends JSONSerializer<User> {
     @Override
     public User deserialize(JSONObject json) throws JSONException {
         User juser = new User();
-        juser.UID = json.getInt("uid");
-        juser.UName = json.getString("uname");
+        juser.setUID(json.getInt("uid"));
+        juser.setUName(json.getString("uname"));
         if (json.has("fullname")) {
-            juser.FullName = json.getString("fullname");
+            juser.setFullName(json.getString("fullname"));
         }
         return juser;
     }
@@ -43,17 +43,17 @@ public class UserSerializer extends JSONSerializer<User> {
         JSONObject json = new JSONObject();
 
         try {
-            if (user.UID > 0) {
-                json.put("uid", user.UID);
+            if (user.getUID() > 0) {
+                json.put("uid", user.getUID());
             }
-            if (user.UName != null) {
-                json.put("uname", user.UName);
+            if (user.getUName() != null) {
+                json.put("uname", user.getUName());
             }
-            if (user.FullName != null) {
-                json.put("fullname", user.FullName);
+            if (user.getFullName() != null) {
+                json.put("fullname", user.getFullName());
             }
-            if (user.JID != null) {
-                json.put("jid", user.JID);
+            if (user.getJID() != null) {
+                json.put("jid", user.getJID());
             }
             if (user.MessagesCount > 0) {
                 json.put("MessagesCount", user.MessagesCount);
-- 
cgit v1.2.3


From ee0e13e7243abecf242236c224551774195524a3 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 10 Jan 2016 20:10:19 +0300
Subject: refactoring, part 2

---
 src/main/java/com/juick/json/MessageSerializer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
index 85986415..dccf1b3a 100644
--- a/src/main/java/com/juick/json/MessageSerializer.java
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -49,7 +49,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
         jmsg.FriendsOnly = json.has("friendsonly");
         jmsg.ReadOnly = json.has("readonly");
 
-        jmsg.Text = json.getString("body").replace("&quot;", "\"");
+        jmsg.setText(json.getString("body").replace("&quot;", "\""));
         jmsg.setUser(userSerializer.deserialize(json.getJSONObject("user")));
 
         try {
@@ -97,8 +97,8 @@ public class MessageSerializer extends JSONSerializer<Message> {
             if (msg.ReadOnly) {
                 json.put("readonly", 1);
             }
-            if (msg.Text != null) {
-                json.put("body", msg.Text);
+            if (msg.getText() != null) {
+                json.put("body", msg.getText());
             }
             if (msg.Timestamp != null) {
                 json.put("timestamp", msg.Timestamp);
-- 
cgit v1.2.3


From 9a50ad8dea5e9ebc5eb1c5efb19aa7a784283e14 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 16 Jan 2016 18:25:11 +0300
Subject: date and tests

---
 build.gradle                                       |  1 +
 .../java/com/juick/json/MessageSerializer.java     | 16 ++++++++----
 src/test/java/com/juick/JsonTests.java             | 30 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/com/juick/JsonTests.java

(limited to 'src')

diff --git a/build.gradle b/build.gradle
index 2e438790..456e86c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,4 +6,5 @@ repositories {
 
 dependencies {
     compile 'org.json:json:20151123'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
index dccf1b3a..da87d4be 100644
--- a/src/main/java/com/juick/json/MessageSerializer.java
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -22,6 +22,9 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -31,10 +34,14 @@ import org.json.JSONObject;
  * @author Ugnich Anton
  */
 public class MessageSerializer extends JSONSerializer<Message> {
+
+    private final static Logger LOGGER = Logger.getLogger(MessageSerializer.class.getName());
     
     UserSerializer userSerializer = new UserSerializer();
     PlaceSerializer placeSerializer = new PlaceSerializer();
 
+    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     @Override
     public Message deserialize(JSONObject json) throws JSONException {
         com.juick.Message jmsg = new com.juick.Message();
@@ -55,7 +62,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
         try {
             DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             df.setTimeZone(TimeZone.getTimeZone("UTC"));
-            jmsg.Timestamp = df.parse(json.getString("timestamp"));
+            jmsg.setDate(df.parse(json.getString("timestamp")));
         } catch (ParseException e) {
         }
 
@@ -100,10 +107,8 @@ public class MessageSerializer extends JSONSerializer<Message> {
             if (msg.getText() != null) {
                 json.put("body", msg.getText());
             }
-            if (msg.Timestamp != null) {
-                json.put("timestamp", msg.Timestamp);
-            } else if (msg.TimestampString != null) {
-                json.put("timestamp", msg.TimestampString);
+            if (msg.getDate() != null) {
+                json.put("timestamp", df.format(msg.getDate()));
             }
             if (msg.getUser() != null) {
                 json.put("user", userSerializer.serialize(msg.getUser()));
@@ -126,6 +131,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
                 json.put("photo", photo);
             }
         } catch (JSONException e) {
+            LOGGER.log(Level.SEVERE, "JSON Exception", e);
         }
 
         return json;
diff --git a/src/test/java/com/juick/JsonTests.java b/src/test/java/com/juick/JsonTests.java
new file mode 100644
index 00000000..5d78a2d6
--- /dev/null
+++ b/src/test/java/com/juick/JsonTests.java
@@ -0,0 +1,30 @@
+package com.juick;
+
+import static org.junit.Assert.assertEquals;
+
+import com.juick.json.MessageSerializer;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.juick.Message;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public class JsonTests {
+    @Test
+    public void DateTest() {
+        Message msg = new Message();
+        SimpleDateFormat df= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            msg.setDate(df.parse("2015-01-01 00:00:00"));
+            MessageSerializer serializer = new MessageSerializer();
+            String json = serializer.serialize(msg).toString();
+            assertEquals("{\"timestamp\":\"2015-01-01 00:00:00\"}", json);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 1a39696a6eaf4ea41447e4426ccdcfacec657554 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 16 Jan 2016 19:03:54 +0300
Subject: update test for date and time

---
 src/test/java/com/juick/JsonTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/test/java/com/juick/JsonTests.java b/src/test/java/com/juick/JsonTests.java
index 5d78a2d6..890360c1 100644
--- a/src/test/java/com/juick/JsonTests.java
+++ b/src/test/java/com/juick/JsonTests.java
@@ -18,10 +18,10 @@ public class JsonTests {
         Message msg = new Message();
         SimpleDateFormat df= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
-            msg.setDate(df.parse("2015-01-01 00:00:00"));
+            msg.setDate(df.parse("2015-01-01 05:02:10"));
             MessageSerializer serializer = new MessageSerializer();
             String json = serializer.serialize(msg).toString();
-            assertEquals("{\"timestamp\":\"2015-01-01 00:00:00\"}", json);
+            assertEquals("{\"timestamp\":\"2015-01-01 05:02:10\"}", json);
         } catch (ParseException e) {
             e.printStackTrace();
         }
-- 
cgit v1.2.3


From 143513cec90ab176e5c174fb4ed98c249652bda6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 16 Jan 2016 19:13:30 +0300
Subject: refactoring

---
 src/main/java/com/juick/json/JSONSerializer.java    |  3 ++-
 src/main/java/com/juick/json/MessageSerializer.java | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/json/JSONSerializer.java b/src/main/java/com/juick/json/JSONSerializer.java
index 8ac72cb0..142cacf0 100644
--- a/src/main/java/com/juick/json/JSONSerializer.java
+++ b/src/main/java/com/juick/json/JSONSerializer.java
@@ -5,6 +5,7 @@
  */
 package com.juick.json;
 
+import java.text.ParseException;
 import java.util.Iterator;
 import java.util.List;
 import org.json.JSONObject;
@@ -21,7 +22,7 @@ public abstract class JSONSerializer<T> {
      * @param json
      * @return
      */
-    public abstract T deserialize(JSONObject json);
+    public abstract T deserialize(JSONObject json) throws ParseException;
     
     /**
      *
diff --git a/src/main/java/com/juick/json/MessageSerializer.java b/src/main/java/com/juick/json/MessageSerializer.java
index da87d4be..4818722f 100644
--- a/src/main/java/com/juick/json/MessageSerializer.java
+++ b/src/main/java/com/juick/json/MessageSerializer.java
@@ -40,10 +40,15 @@ public class MessageSerializer extends JSONSerializer<Message> {
     UserSerializer userSerializer = new UserSerializer();
     PlaceSerializer placeSerializer = new PlaceSerializer();
 
-    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    final SimpleDateFormat df;
+
+    public MessageSerializer() {
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
 
     @Override
-    public Message deserialize(JSONObject json) throws JSONException {
+    public Message deserialize(JSONObject json) throws JSONException, ParseException {
         com.juick.Message jmsg = new com.juick.Message();
         jmsg.setMID(json.getInt("mid"));
         if (json.has("rid")) {
@@ -59,12 +64,7 @@ public class MessageSerializer extends JSONSerializer<Message> {
         jmsg.setText(json.getString("body").replace("&quot;", "\""));
         jmsg.setUser(userSerializer.deserialize(json.getJSONObject("user")));
 
-        try {
-            DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            df.setTimeZone(TimeZone.getTimeZone("UTC"));
-            jmsg.setDate(df.parse(json.getString("timestamp")));
-        } catch (ParseException e) {
-        }
+        jmsg.setDate(df.parse(json.getString("timestamp")));
 
         if (json.has("tags")) {
             JSONArray tags = json.getJSONArray("tags");
-- 
cgit v1.2.3


From 9dfad84fa487960fde4cc4b0ac6760c8dd5f4ac9 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 16 Jan 2016 19:16:41 +0300
Subject: fix tests

---
 src/test/java/com/juick/JsonTests.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/test/java/com/juick/JsonTests.java b/src/test/java/com/juick/JsonTests.java
index 890360c1..ba01e80c 100644
--- a/src/test/java/com/juick/JsonTests.java
+++ b/src/test/java/com/juick/JsonTests.java
@@ -11,12 +11,14 @@ import com.juick.Message;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.TimeZone;
 
 public class JsonTests {
     @Test
     public void DateTest() {
         Message msg = new Message();
         SimpleDateFormat df= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
         try {
             msg.setDate(df.parse("2015-01-01 05:02:10"));
             MessageSerializer serializer = new MessageSerializer();
-- 
cgit v1.2.3


From fc46d9c1f8c9967f9c648f09a3714e8c3a4ed75a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 8 Apr 2016 16:23:55 +0300
Subject: update api

---
 src/main/java/com/juick/json/UserSerializer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/json/UserSerializer.java b/src/main/java/com/juick/json/UserSerializer.java
index 4485812a..390f4bf6 100644
--- a/src/main/java/com/juick/json/UserSerializer.java
+++ b/src/main/java/com/juick/json/UserSerializer.java
@@ -55,8 +55,8 @@ public class UserSerializer extends JSONSerializer<User> {
             if (user.getJID() != null) {
                 json.put("jid", user.getJID());
             }
-            if (user.MessagesCount > 0) {
-                json.put("MessagesCount", user.MessagesCount);
+            if (user.getUnreadCount() > 0) {
+                json.put("unreadCount", user.getUnreadCount());
             }
         } catch (JSONException e) {
         }
-- 
cgit v1.2.3