From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Tue, 29 Jan 2019 02:02:24 +0000 (-0600)
Subject: JSON code moved to swingjs.json.JSON
X-Git-Tag: Release_2_11_4_0~45^2~18^2~281
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4d267ccd21ce4006fe940987b0c1f5c832205d48;p=jalview.git

JSON code moved to swingjs.json.JSON
---

diff --git a/src/jalview/javascript/json/JSON.java b/src/jalview/javascript/json/JSON.java
index 6cb7cb5..af78b0f 100644
--- a/src/jalview/javascript/json/JSON.java
+++ b/src/jalview/javascript/json/JSON.java
@@ -28,95 +28,6 @@ import java.util.List;
 public class JSON {
 
 	/**
-	 * A privately initialized class that allows us to do the object
-	 * conversion from JavaScript to "Java" on the fly. 
-	 * 
-	 * @author hansonr
-	 *
-	 */
-	@SuppressWarnings("serial")
-	public static class JSONList extends ArrayList<Object>  {
-
-
-		static ListIterator iter;
-		
-		JSONList(Object[] a) {
-			super();
-			/**
-			 * @j2sNative
-			 * 
-			 * this.elementData = a;
-			 * this.size = a.length;
-			 */
-		}
-		
-		public Object get(int i) {
-			Object o = null;
-			/**
-			 * @j2sNative
-			 * 
-			 *  o = this.elementData[i]; 
-			 *  
-			 */
-			return JSON.toObject(o);
-		}
-
-
-		@Override
-		public Iterator<Object> iterator() {
-			if (iter == null)
-				iter = new ListIterator();
-			iter.pt = 0;
-			iter.list = this;
-			return iter;
-		}
-
-		
-		/**
-		 * 
-		 * @author hansonr
-		 *
-		 */
-		public static class ListIterator implements Iterator<Object> {
-
-			ListIterator() {/* restricted */}
-			
-			public JSONList list;
-			int pt = -1;
-
-			@Override
-			public boolean hasNext() {
-				@SuppressWarnings("unused")
-				boolean more;
-				/**
-				 * @j2sNative
-				 * 
-				 * more = this.list && (this.pt < this.list.size);
-				 * if (!more) {
-				 *   this.list = null;
-				 *   this.pt = -1;
-				 * }
-				 * return more; 
-				 */
-				{
-				return pt < list.size();
-				}
-			}
-
-			@Override
-			public Object next() {
-				Object o = null;
-				/**
-				 * @j2sNative o = this.list.elementData[this.pt++];
-				 * 
-				 */
-				
-				return toObject(o);				
-			}
-		}
-	}
-
-	/**
 	 * A simple encoding of sequential key/value pairs for a jQuery.ajax call. If
 	 * the first key is "url" and the second is an object, then the ajax object is
 	 * attached to that url as well, just for transport purposes within the system.
@@ -124,132 +35,26 @@ public class JSON {
 	 * @param keyValues assumed to be simple String,Object pairs. String objects
 	 *                  will be surrounded by double quotes.
 	 */
+	@SuppressWarnings("static-access")
 	public static Object setAjax(Object... keyValues) {
-		Object ajax = null;
-		/**
-		 * @j2sNative ajax = {}; if (keyValues[0] == "url" && typeof keyValues[1] ==
-		 *            "object") { ajax = keyValues[1].ajax || (keyValues[1].ajax = ajax); }
-		 * 
-		 *            for (var i = 0; i < keyValues.length;) { var key = keyValues[i++];
-		 *            var val = keyValues[i++]; ajax[key] = val; }
-		 */
-		return ajax;
+		return /** @j2sNative swingjs.JSUtil.setAjax$OA(keyValues) || */null;
 	}
 
 	public static void setAjax(URL url) {
-		setAjax("url", url, "dataType", "json", "async", Boolean.FALSE);	
+		/** @j2sNative swingjs.JSUtil.setAjax$O(url) */;
 	}
 
 	public static BufferedReader getJSONReader(InputStream is) {
-		return new JSONReader(is);
-	}
-
-	public static class JSONReader extends BufferedReader {
-		Object data;
-
-		public JSONReader(InputStream in) {
-			super((Reader) (Object) in);
-			// could be buffered
-			data = toObject(/** @j2sNative $in._ajaxData || $in.$in && $in.$in._ajaxData || */ null);
-			
-		}
-
-		public JSONReader(Reader in) {
-			super(in);
-			// could be buffered
-			data = toObject(/** @j2sNative $in._ajaxData || $in.$in && $in.$in._ajaxData || */ null);
-		}
-
-		public JSONReader(String json) {
-			super((Reader) (Object) "");
-			data = toObject(/** @j2sNative  swingjs.JSUtil.parseJSON$S(json)|| */null); 
-		}
-
-		@Override
-		public void close() {
-			data = null;
-			try {
-				super.close();
-			} catch (IOException e) {
-				// ignore, especially if we set $in to a string!
-			}
-		}
+		return /** @j2sNative swingjs.JSUtil.getJSONReader$O(is) || */null;
 	}
 
 	@SuppressWarnings("resource")
 	public static Object parse(String json) {
-		return new JSONReader(json).data;
+		return /** @j2sNative swingjs.JSUtil.parseJSON$O(json) || */null;
 	}
 
 	public static Object parse(Reader br) {
-		return ((JSONReader) br).data;
-	}
-
-	/**
-	 * Get an object in the JSON associative array.
-	 * @param br
-	 * @param key
-	 * @return
-	 */
-	@SuppressWarnings("unused")
-	public static Object toObject(Object o) {
-		if (o == null)
-			return null;
-		String type = /** @j2sNative (typeof o) + */"";
-		switch (type) {
-		case "string":
-			return o;
-		case "number":
-			double n = 0;
-			if (/** @j2sNative (n = o) == (n|0) || */false)
-				return Long.valueOf((long) n);
-			return Double.valueOf(n);
-		case "boolean":
-			return Boolean.valueOf(/** @j2sNative !!o || */false);
-		case "object":
-			boolean isArray =  /** @j2sNative o instanceof Array || */false;
-			if (isArray) {
-				return toList((Object[]) o);
-			}
-			return toMap(o);
-		default:
-			return o;
-		}
-	}
-	
-	Object get(String key) {
-		/**
-		 * @j2sNative
-		 * 
-		 *  return C$.toObject$O(this[key]);
-		 */
-		{
-			return null;
-		}
-	}
-	boolean contains(String key) {
-		/**
-		 * @j2sNative
-		 * 
-		 *  return typeof this[key] != "undefined"
-		 */
-		{
-			return false;
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	private static Hashtable<String, Object> toMap(Object map) {
-		/**
-		 * @j2sNative
-		 * map.get$O = C$.prototype.get$S;
-		 * map.contains$O = C$.prototype.contains$S;
-		 */			
-		return (Hashtable<String, Object>) map;
-	}
-
-	private static List<Object> toList(Object[] a) {
-		return new JSONList(a);
+		return /** @j2sNative swingjs.JSUtil.parseJSON$O(br) || */null;
 	}
 
 }