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 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 @@ - - - - - - - - - - - Builds, tests, and runs the project com.juick.json. - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - Must select one file in the IDE or set profile.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - org.netbeans.modules.java.j2seproject - - - com.juick.json - - - - - - - - - - com_juick - jar - - jar - clean - jar - - - - 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 . - */ -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(""", "\""); - 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(""", "\"")); - } - } - - 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 messages) { - String json = "["; - - Iterator 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 . - */ -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(""", "\""); - 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 . - */ -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 users) { - String json = "["; - - Iterator 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 . + */ +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(""", "\""); + 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(""", "\"")); + } + } + + 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 messages) { + String json = "["; + + Iterator 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 . + */ +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(""", "\""); + 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 . + */ +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 users) { + String json = "["; + + Iterator 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