Merge pull request #38 from netplex/v2.2.2

V2.2.2

Author: UrielCh

.gitignore

@@ -1,22 +1,7 @@
-
-/json-smart/target
-/json-smart/.settings
-/json-smart/.classpath
-/json-smart/.project
-/parent/.project
-/parent/.settings
-/json-smart/src/test/java/asm
-/asm/.classpath
-/asm/.project
-/asm/.settings
-/asm/targetjson-smart-backport/.classpath
-json-smart-backport/.project
-json-smart-backport/.settings
-asm/target/
-json-smart-backport/target/
-json-smart/target/
-**/.project 
+**/.classpath
+**/.idea/
+**/.project
+**/.settings/
+**/*.iml
 **/bin
-*.classpath
-*.project
-*.prefs
+**/target

accessors-smart/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.minidev</groupId>
     <artifactId>accessors-smart</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
     <name>ASM based accessors helper used by json-smart</name>
     <description>Java reflect give poor performance on getter setter an constructor calls, accessors-smart use ASM to speed up those calls.
     </description>

accessors-smart/src/main/java/net/minidev/asm/ConvertDate.java

@@ -8,6 +8,7 @@
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.StringTokenizer;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
 public class ConvertDate {
@@ -40,6 +41,7 @@ private static Integer parseMonth(String s1) {
 	static {
 		voidData.add("CET");
 		voidData.add("MEZ");
+		voidData.add("PST");
 		voidData.add("Uhr");
 		voidData.add("h");
 		voidData.add("pm");
@@ -118,6 +120,8 @@ public static Date convertToDate(Object obj) {
 			return null;
 		if (obj instanceof Date)
 			return (Date) obj;
+		if (obj instanceof Number)
+			return new Date(((Number)obj).longValue());
 		if (obj instanceof String) {
 			StringTokenizer st = new StringTokenizer((String) obj, " -/:,.+");
 			String s1 = "";
@@ -204,8 +208,12 @@ private static Date getMMDDYYYY(StringTokenizer st, String s1) {
 				return null;
 			s1 = st.nextToken();
 		}
-		cal.set(Calendar.YEAR, getYear(s1));
-
+		if (s1.length() == 4)
+			cal.set(Calendar.YEAR, getYear(s1));
+		else if (s1.length() == 2) {
+			return addHour2(st, cal, s1);
+			
+		}
 		// /if (st.hasMoreTokens())
 		// return null;
 		// s1 = st.nextToken();
@@ -236,6 +244,10 @@ private static Date addHour(StringTokenizer st, Calendar cal, String s1) {
 				return cal.getTime();
 			s1 = st.nextToken();
 		}
+		return addHour2(st, cal, s1);
+	}
+	
+	private static Date addHour2(StringTokenizer st, Calendar cal, String s1) {
 		cal.set(Calendar.HOUR_OF_DAY, Integer.parseInt(s1));
 
 		if (!st.hasMoreTokens())
@@ -273,13 +285,19 @@ private static Date addHour(StringTokenizer st, Calendar cal, String s1) {
 		s1 = trySkip(st, s1, cal);
 		// if (s1.equalsIgnoreCase("pm"))
 		// cal.add(Calendar.HOUR_OF_DAY, 12);
+		
+		if (s1.length() == 4 && Character.isDigit(s1.charAt(0)))
+			cal.set(Calendar.YEAR, getYear(s1));
+
 		return cal.getTime();
 	}
 
 	private static String trySkip(StringTokenizer st, String s1, Calendar cal) {
 		while (voidData.contains(s1)) {
 			if (s1.equalsIgnoreCase("pm"))
 				cal.add(Calendar.HOUR_OF_DAY, 12);
+			if (s1.equalsIgnoreCase("PST"))
+				cal.setTimeZone(TimeZone.getTimeZone("PST"));
 			if (!st.hasMoreTokens())
 				return null;
 			s1 = st.nextToken();

accessors-smart/src/test/java/net/minidev/asm/TestDateConvert.java

@@ -17,6 +17,7 @@ public void testDateFR() throws Exception {
 		tests.add("23 janvier 2012 13:42:12");
 		tests.add("lundi 23 janvier 2012 13:42:12");
 		tests.add("2012-01-23 13:42:12");
+		tests.add("Thu Jan 23 13:42:12 PST 2012");
 		//
 		for (String testDate : tests) {
 			Date parsed = null;

json-smart/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.minidev</groupId>
     <artifactId>json-smart</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2</version>
     <name>JSON Small and Fast Parser</name>
     <description>
         JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write. It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java, JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language.
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>accessors-smart</artifactId>
-            <version>1.1</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
     <reporting>
@@ -95,7 +95,7 @@
             	<!-- My old Is back -->
                 <gpg.keyname>2C8DF6EC</gpg.keyname>
                 <!-- <gpg.keyname>8E322ED0</gpg.keyname> -->
-                <!-- <gpg.keyname>Uriel Chemouni (dev) <[email protected]></gpg.keyname> -->
+                <!-- <gpg.keyname>Uriel Chemouni (dev) [email protected]</gpg.keyname> -->
                 <!-- GPG Key ID to use for signing -->
             </properties>
             <build>
@@ -264,4 +264,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

json-smart/src/main/java/net/minidev/json/JSONArray.java

@@ -24,8 +24,8 @@
 /**
  * A JSON array. JSONObject supports java.util.List interface.
  * 
- * @author FangYidong<[email protected]>
- * @author Uriel Chemouni <[email protected]>
+ * @author FangYidong &lt;[email protected]&gt;
+ * @author Uriel Chemouni &lt;[email protected]&gt;
  */
 public class JSONArray extends ArrayList<Object> implements List<Object>, JSONAwareEx, JSONStreamAwareEx {
 	private static final long serialVersionUID = 9106884089231309568L;

json-smart/src/main/java/net/minidev/json/JSONAware.java

@@ -19,7 +19,7 @@
  * Beans that support customized output of JSON text shall implement this
  * interface.
  * 
- * @author FangYidong<[email protected]>
+ * @author FangYidong &lt;[email protected]&gt;
  */
 public interface JSONAware {
 	/**

json-smart/src/main/java/net/minidev/json/JSONAwareEx.java

@@ -20,7 +20,7 @@
  * 
  * Adding compressions and formating features
  * 
- * @author Uriel Chemouni <[email protected]>
+ * @author Uriel Chemouni &lt;[email protected]&gt;
  */
 
 public interface JSONAwareEx extends JSONAware{

json-smart/src/main/java/net/minidev/json/JSONNavi.java

@@ -27,7 +27,7 @@
  * 
  * @since 1.0.9
  * 
- * @author Uriel Chemouni <[email protected]>
+ * @author Uriel Chemouni &lt;[email protected]&gt;
  */
 public class JSONNavi<T> {
 	private JsonReaderI<? super T> mapper;

json-smart/src/main/java/net/minidev/json/JSONObject.java

@@ -25,8 +25,8 @@
  * A JSON object. Key value pairs are unordered. JSONObject supports
  * java.util.Map interface.
  * 
- * @author FangYidong<[email protected]>
- * @author Uriel Chemouni <[email protected]>
+ * @author FangYidong &lt;[email protected]&gt;
+ * @author Uriel Chemouni &lt;[email protected]&gt;
  */
 public class JSONObject extends HashMap<String, Object> implements JSONAware, JSONAwareEx, JSONStreamAwareEx {
 	private static final long serialVersionUID = -503443796854799292L;
@@ -113,7 +113,6 @@ public String getAsString(String key) {
 	/**
 	 * A Simple Helper cast an Object to an Number
 	 * 
-	 * @see net.minidev.json.parser.JSONParserBase#parseNumber(String s)
 	 * @return a Number or null
 	 */
 	public Number getAsNumber(String key) {