diff --git a/.classpath b/.classpath new file mode 100644 index 000000000..3e0fb272a --- /dev/null +++ b/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..fad32f265 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.class diff --git a/.project b/.project new file mode 100644 index 000000000..249ee27a8 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + json-java + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/CDL.java b/src/org/json/CDL.java similarity index 100% rename from CDL.java rename to src/org/json/CDL.java diff --git a/Cookie.java b/src/org/json/Cookie.java similarity index 100% rename from Cookie.java rename to src/org/json/Cookie.java diff --git a/CookieList.java b/src/org/json/CookieList.java similarity index 95% rename from CookieList.java rename to src/org/json/CookieList.java index 7f4fe0751..b89778ca9 100755 --- a/CookieList.java +++ b/src/org/json/CookieList.java @@ -31,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2010-12-24 */ +@SuppressWarnings("rawtypes") public class CookieList { /** @@ -70,7 +71,7 @@ public static JSONObject toJSONObject(String string) throws JSONException { */ public static String toString(JSONObject jo) throws JSONException { boolean b = false; - Iterator keys = jo.keys(); + Iterator keys = jo.keys(); String string; StringBuffer sb = new StringBuffer(); while (keys.hasNext()) { diff --git a/HTTP.java b/src/org/json/HTTP.java similarity index 96% rename from HTTP.java rename to src/org/json/HTTP.java index 0ce7a2161..b56fca5fb 100755 --- a/HTTP.java +++ b/src/org/json/HTTP.java @@ -31,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2010-12-24 */ +@SuppressWarnings("rawtypes") public class HTTP { /** Carriage return/line feed. */ diff --git a/HTTPTokener.java b/src/org/json/HTTPTokener.java similarity index 100% rename from HTTPTokener.java rename to src/org/json/HTTPTokener.java diff --git a/JSONArray.java b/src/org/json/JSONArray.java similarity index 99% rename from JSONArray.java rename to src/org/json/JSONArray.java index 4ae610f03..19443cc10 100644 --- a/JSONArray.java +++ b/src/org/json/JSONArray.java @@ -78,6 +78,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2011-12-19 */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class JSONArray { diff --git a/JSONException.java b/src/org/json/JSONException.java similarity index 100% rename from JSONException.java rename to src/org/json/JSONException.java diff --git a/JSONML.java b/src/org/json/JSONML.java similarity index 99% rename from JSONML.java rename to src/org/json/JSONML.java index c329179c0..2e534ab17 100755 --- a/JSONML.java +++ b/src/org/json/JSONML.java @@ -34,6 +34,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2011-11-24 */ +@SuppressWarnings("rawtypes") public class JSONML { /** diff --git a/JSONObject.java b/src/org/json/JSONObject.java similarity index 99% rename from JSONObject.java rename to src/org/json/JSONObject.java index c4ad5509c..a17c0ef71 100755 --- a/JSONObject.java +++ b/src/org/json/JSONObject.java @@ -87,6 +87,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2011-11-24 */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class JSONObject { /** diff --git a/JSONString.java b/src/org/json/JSONString.java similarity index 100% rename from JSONString.java rename to src/org/json/JSONString.java diff --git a/JSONStringer.java b/src/org/json/JSONStringer.java similarity index 100% rename from JSONStringer.java rename to src/org/json/JSONStringer.java diff --git a/JSONTokener.java b/src/org/json/JSONTokener.java similarity index 100% rename from JSONTokener.java rename to src/org/json/JSONTokener.java diff --git a/JSONWriter.java b/src/org/json/JSONWriter.java similarity index 100% rename from JSONWriter.java rename to src/org/json/JSONWriter.java diff --git a/Test.java b/src/org/json/Test.java similarity index 99% rename from Test.java rename to src/org/json/Test.java index 7cf8c32d3..ab21b0518 100755 --- a/Test.java +++ b/src/org/json/Test.java @@ -42,6 +42,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2011-10-25 */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class Test extends TestCase { public Test(String name) { super(name); diff --git a/XML.java b/src/org/json/XML.java similarity index 99% rename from XML.java rename to src/org/json/XML.java index e32819159..2be9f0a61 100755 --- a/XML.java +++ b/src/org/json/XML.java @@ -33,6 +33,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2011-02-11 */ +@SuppressWarnings("rawtypes") public class XML { /** The Character '&'. */ @@ -397,7 +398,7 @@ public static String toString(Object object, String tagName) JSONArray ja; JSONObject jo; String key; - Iterator keys; + Iterator keys; int length; String string; Object value; diff --git a/XMLTokener.java b/src/org/json/XMLTokener.java similarity index 96% rename from XMLTokener.java rename to src/org/json/XMLTokener.java index 8762eae65..9346d70aa 100755 --- a/XMLTokener.java +++ b/src/org/json/XMLTokener.java @@ -30,6 +30,7 @@ of this software and associated documentation files (the "Software"), to deal * @author JSON.org * @version 2010-12-24 */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class XMLTokener extends JSONTokener {