String.getBytes(b, Charset.forName(...))

Author: hansonr

sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js

@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 1/3/2019 3.2.4.06 adds ByteBuffer/CharBuffer support, proper CharSet encoding, including GBK (Standard Chinese)
 // BH 12/30/2018 3.2.4.05 adds Class.forName("[XXX")
 // BH 12/20/2018 3.2.4.05 fixes synthetic reference issue 
 // BH 12/13/2018 3.2.4.05 fixes Class.js field reflection, inner anonymous class of outer class creates wrong synthetic pointer 
@@ -113,8 +114,8 @@ window["j2s.clazzloaded"] = true;
   _debugging: false,
   _loadcore: true,
   _nooutput: 0,
-  _VERSION_R: "3.2.4.05",
-  _VERSION_T: "3.2.4.05",
+  _VERSION_R: "3.2.4.06",
+  _VERSION_T: "3.2.4.06",
 };
 
 ;(function(Clazz, J2S) {
@@ -4490,26 +4491,30 @@ var getChars = function(s, srcBegin,srcEnd,dst,dstBegin, asBytes){
 	}
 };
 
+//var charset=["utf-8","utf8","us-ascii","iso-8859-1","8859_1","gb2312","gb18030"];
+var charset=["utf-8","utf8","us-ascii","iso-8859-1"]; // gb* uses GBK
 sp.getBytes$=sp.getBytes$S=sp.getBytes$java_nio_charset_Charset=function(){
 var s=this;
 if(arguments.length==1){
-var cs=arguments[0].toString().toLowerCase();
-var charset=[
-"utf-8","utf8","us-ascii","iso-8859-1","8859_1","gb2312","gb18030","gbk"
-];
-var existed=false;
-for(var i=0;i<charset.length;i++){
-if(charset[i]==cs){
-existed=true;
-break;
-}
-}
-if(!existed){
-throw new java.io.UnsupportedEncodingException();
-}
-if(cs=="utf-8"||cs=="utf8"){
-s=Encoding.convert2UTF8(this);
-}
+ var cs=arguments[0].toString().toLowerCase();
+ var simple=false;
+ for(var i=0;i<charset.length;i++){
+  if(charset[i]==cs){
+   simple=true;
+   break;
+  }
+ }
+ if(!simple){
+  cs = arguments[0];
+  if (typeof cs == "string")
+   cs = Clazz.loadClass("java.nio.charset.Charset").forName$S(cs);
+  if (!cs)
+	throw new java.io.UnsupportedEncodingException();
+  return cs.encode$S(this.toString()).toArray$();	
+ }
+ if(cs=="utf-8"||cs=="utf8"){
+  s=Encoding.convert2UTF8(this);
+ }
 }
 var arrs=[];
 for(var i=0, ii=0;i<s.length;i++){
@@ -4739,12 +4744,18 @@ case 4:
   // String(byte[] ascii, int hibyte, int offset, int count)
 
   var bytes=arguments[0];
-  var encoding=arguments[3];
-  if(typeof encoding != "number"){
-    // assumes UTF-8
+  var cs=arguments[3];
+  if(typeof cs != "number"){
     var offset=arguments[1];
     var length=arguments[2];
-    return Encoding.readUTF8Array(bytes, offset, length);
+    if (typeof cs == "string") {
+    	if (",utf8,utf-8,utf_8,".indexOf("," + cs + ",") >= 0)
+    		return Encoding.readUTF8Array(bytes,offset,length);
+    	cs = Clazz.loadClass("java.nio.charset.Charset").forName$S(cs);
+    	if (!cs)
+    		throw new java.io.UnsupportedEncodingException();
+    }
+    return cs.decode$BA$I$I(bytes, offset, length).toString();
   }
   var count=arguments[3];
   var offset=arguments[2];
@@ -4950,6 +4961,22 @@ if (typeof c == "string")
 return (c >= 0x1c && c <= 0x20 || c >= 0x9 && c <= 0xd || c == 0x1680
   || c >= 0x2000 && c != 0x2007 && (c <= 0x200b || c == 0x2028 || c == 0x2029 || c == 0x3000));
 }, 1);
+m$(C$,"isSurrogate$C", function(c) {
+	 c = c.charCodeAt(0);
+	 return c >= 0xd800 && c < 0xe000;
+	
+}, 1);
+m$(C$,"isHighSurrogate$C", function(c) {
+	 c = c.charCodeAt(0);
+	 return c >= 0xd800 && c < 0xdc00;
+	
+}, 1);
+m$(C$,"isLowSurrogate$C", function(c) {
+	 c = c.charCodeAt(0);
+	 return c >= 0xdc00 && c < 0xe000;
+	
+}, 1);
+
 m$(C$,["digit$C$I","digit$I$I"],
 function(c,radix){
 var i = (typeof c == "string" ? c.charCodeAt(0) : c);