From f2aeacc01bef911b6669a61cefdbf40e42f6c7a0 Mon Sep 17 00:00:00 2001 From: Levka Date: Wed, 22 Oct 2014 15:51:21 +0300 Subject: [PATCH 1/3] Add new .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..812e1c478 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ +*.class +*.log From 7d2e1c1ebb42859f276c170acf2f74f0efa79f5c Mon Sep 17 00:00:00 2001 From: Levka Date: Wed, 22 Oct 2014 15:59:09 +0300 Subject: [PATCH 2/3] Organize the source as Java packages --- .gitignore | 1 + CDL.java => org/json/CDL.java | 0 Cookie.java => org/json/Cookie.java | 0 CookieList.java => org/json/CookieList.java | 0 HTTP.java => org/json/HTTP.java | 0 HTTPTokener.java => org/json/HTTPTokener.java | 0 JSONArray.java => org/json/JSONArray.java | 0 JSONException.java => org/json/JSONException.java | 0 JSONML.java => org/json/JSONML.java | 0 JSONObject.java => org/json/JSONObject.java | 0 JSONString.java => org/json/JSONString.java | 0 JSONStringer.java => org/json/JSONStringer.java | 0 JSONTokener.java => org/json/JSONTokener.java | 0 JSONWriter.java => org/json/JSONWriter.java | 0 Kim.java => org/json/Kim.java | 0 Property.java => org/json/Property.java | 0 README => org/json/README | 0 XML.java => org/json/XML.java | 0 XMLTokener.java => org/json/XMLTokener.java | 0 {zip => org/json/zip}/BitInputStream.java | 0 {zip => org/json/zip}/BitOutputStream.java | 0 {zip => org/json/zip}/BitReader.java | 0 {zip => org/json/zip}/BitWriter.java | 0 {zip => org/json/zip}/Huff.java | 0 {zip => org/json/zip}/JSONzip.java | 0 {zip => org/json/zip}/Keep.java | 0 {zip => org/json/zip}/None.java | 0 {zip => org/json/zip}/PostMortem.java | 0 {zip => org/json/zip}/README | 0 {zip => org/json/zip}/Unzipper.java | 0 {zip => org/json/zip}/Zipper.java | 0 31 files changed, 1 insertion(+) rename CDL.java => org/json/CDL.java (100%) rename Cookie.java => org/json/Cookie.java (100%) rename CookieList.java => org/json/CookieList.java (100%) rename HTTP.java => org/json/HTTP.java (100%) rename HTTPTokener.java => org/json/HTTPTokener.java (100%) rename JSONArray.java => org/json/JSONArray.java (100%) rename JSONException.java => org/json/JSONException.java (100%) rename JSONML.java => org/json/JSONML.java (100%) rename JSONObject.java => org/json/JSONObject.java (100%) rename JSONString.java => org/json/JSONString.java (100%) rename JSONStringer.java => org/json/JSONStringer.java (100%) rename JSONTokener.java => org/json/JSONTokener.java (100%) rename JSONWriter.java => org/json/JSONWriter.java (100%) rename Kim.java => org/json/Kim.java (100%) rename Property.java => org/json/Property.java (100%) rename README => org/json/README (100%) rename XML.java => org/json/XML.java (100%) rename XMLTokener.java => org/json/XMLTokener.java (100%) rename {zip => org/json/zip}/BitInputStream.java (100%) rename {zip => org/json/zip}/BitOutputStream.java (100%) rename {zip => org/json/zip}/BitReader.java (100%) rename {zip => org/json/zip}/BitWriter.java (100%) rename {zip => org/json/zip}/Huff.java (100%) rename {zip => org/json/zip}/JSONzip.java (100%) rename {zip => org/json/zip}/Keep.java (100%) rename {zip => org/json/zip}/None.java (100%) rename {zip => org/json/zip}/PostMortem.java (100%) rename {zip => org/json/zip}/README (100%) rename {zip => org/json/zip}/Unzipper.java (100%) rename {zip => org/json/zip}/Zipper.java (100%) diff --git a/.gitignore b/.gitignore index 812e1c478..af19c867f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea/ *.class *.log +*.iml diff --git a/CDL.java b/org/json/CDL.java similarity index 100% rename from CDL.java rename to org/json/CDL.java diff --git a/Cookie.java b/org/json/Cookie.java similarity index 100% rename from Cookie.java rename to org/json/Cookie.java diff --git a/CookieList.java b/org/json/CookieList.java similarity index 100% rename from CookieList.java rename to org/json/CookieList.java diff --git a/HTTP.java b/org/json/HTTP.java similarity index 100% rename from HTTP.java rename to org/json/HTTP.java diff --git a/HTTPTokener.java b/org/json/HTTPTokener.java similarity index 100% rename from HTTPTokener.java rename to org/json/HTTPTokener.java diff --git a/JSONArray.java b/org/json/JSONArray.java similarity index 100% rename from JSONArray.java rename to org/json/JSONArray.java diff --git a/JSONException.java b/org/json/JSONException.java similarity index 100% rename from JSONException.java rename to org/json/JSONException.java diff --git a/JSONML.java b/org/json/JSONML.java similarity index 100% rename from JSONML.java rename to org/json/JSONML.java diff --git a/JSONObject.java b/org/json/JSONObject.java similarity index 100% rename from JSONObject.java rename to org/json/JSONObject.java diff --git a/JSONString.java b/org/json/JSONString.java similarity index 100% rename from JSONString.java rename to org/json/JSONString.java diff --git a/JSONStringer.java b/org/json/JSONStringer.java similarity index 100% rename from JSONStringer.java rename to org/json/JSONStringer.java diff --git a/JSONTokener.java b/org/json/JSONTokener.java similarity index 100% rename from JSONTokener.java rename to org/json/JSONTokener.java diff --git a/JSONWriter.java b/org/json/JSONWriter.java similarity index 100% rename from JSONWriter.java rename to org/json/JSONWriter.java diff --git a/Kim.java b/org/json/Kim.java similarity index 100% rename from Kim.java rename to org/json/Kim.java diff --git a/Property.java b/org/json/Property.java similarity index 100% rename from Property.java rename to org/json/Property.java diff --git a/README b/org/json/README similarity index 100% rename from README rename to org/json/README diff --git a/XML.java b/org/json/XML.java similarity index 100% rename from XML.java rename to org/json/XML.java diff --git a/XMLTokener.java b/org/json/XMLTokener.java similarity index 100% rename from XMLTokener.java rename to org/json/XMLTokener.java diff --git a/zip/BitInputStream.java b/org/json/zip/BitInputStream.java similarity index 100% rename from zip/BitInputStream.java rename to org/json/zip/BitInputStream.java diff --git a/zip/BitOutputStream.java b/org/json/zip/BitOutputStream.java similarity index 100% rename from zip/BitOutputStream.java rename to org/json/zip/BitOutputStream.java diff --git a/zip/BitReader.java b/org/json/zip/BitReader.java similarity index 100% rename from zip/BitReader.java rename to org/json/zip/BitReader.java diff --git a/zip/BitWriter.java b/org/json/zip/BitWriter.java similarity index 100% rename from zip/BitWriter.java rename to org/json/zip/BitWriter.java diff --git a/zip/Huff.java b/org/json/zip/Huff.java similarity index 100% rename from zip/Huff.java rename to org/json/zip/Huff.java diff --git a/zip/JSONzip.java b/org/json/zip/JSONzip.java similarity index 100% rename from zip/JSONzip.java rename to org/json/zip/JSONzip.java diff --git a/zip/Keep.java b/org/json/zip/Keep.java similarity index 100% rename from zip/Keep.java rename to org/json/zip/Keep.java diff --git a/zip/None.java b/org/json/zip/None.java similarity index 100% rename from zip/None.java rename to org/json/zip/None.java diff --git a/zip/PostMortem.java b/org/json/zip/PostMortem.java similarity index 100% rename from zip/PostMortem.java rename to org/json/zip/PostMortem.java diff --git a/zip/README b/org/json/zip/README similarity index 100% rename from zip/README rename to org/json/zip/README diff --git a/zip/Unzipper.java b/org/json/zip/Unzipper.java similarity index 100% rename from zip/Unzipper.java rename to org/json/zip/Unzipper.java diff --git a/zip/Zipper.java b/org/json/zip/Zipper.java similarity index 100% rename from zip/Zipper.java rename to org/json/zip/Zipper.java From 44adc1cd28f85609911d8b855f71731bc687ee8d Mon Sep 17 00:00:00 2001 From: Levka Date: Wed, 22 Oct 2014 18:20:33 +0300 Subject: [PATCH 3/3] Create working example --- .gitignore | 1 + org/Xml2JsonRun.java | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 org/Xml2JsonRun.java diff --git a/.gitignore b/.gitignore index af19c867f..27a128a67 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.class *.log *.iml +out/ diff --git a/org/Xml2JsonRun.java b/org/Xml2JsonRun.java new file mode 100644 index 000000000..902222774 --- /dev/null +++ b/org/Xml2JsonRun.java @@ -0,0 +1,28 @@ +package org; + +import org.json.JSONObject; +import org.json.XML; + +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Paths; + +/** + * Created by ozlevka on 10/22/14. + */ +public class Xml2JsonRun { + public static int PRETTY_PRINT_INDENT_FACTOR = 4; + + + public static void main(String[] args) { + try { + byte[] allBytes = Files.readAllBytes(Paths.get("/home/ozlevka/Downloads/earthquakes.xml")); + String xml = new String(allBytes, 0, allBytes.length, Charset.forName("UTF-8")); + JSONObject obj = XML.toJSONObject(xml); + System.out.println(obj.toString(PRETTY_PRINT_INDENT_FACTOR)); + } catch (IOException e) { + e.printStackTrace(); + } + } +}