From be1fe6d476f14a8aff005ae916360354021d4f95 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Mon, 3 Sep 2012 18:36:31 +0200 Subject: [PATCH] sync from RS --- CS2JLibrary/NetFramework/System/Math.xml | 16 ++++++++++++++++ .../NetFramework/System/Text/Encoding.xml | 12 ++++++++++++ .../src/CS2JNet/System/Collections/CSList.java | 4 ++++ .../src/CS2JNet/System/Net/Mail/MailAddress.java | 2 +- .../src/CS2JNet/System/StringSupport.java | 5 ++++- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/CS2JLibrary/NetFramework/System/Math.xml b/CS2JLibrary/NetFramework/System/Math.xml index 9a24525..f857ddc 100644 --- a/CS2JLibrary/NetFramework/System/Math.xml +++ b/CS2JLibrary/NetFramework/System/Math.xml @@ -142,6 +142,22 @@ Max System.Number + + + Math.pow(${a},${b}) + + + System.Double + a + + + System.Double + b + + + Pow + System.Double + Math.round(${d}) diff --git a/CS2JLibrary/NetFramework/System/Text/Encoding.xml b/CS2JLibrary/NetFramework/System/Text/Encoding.xml index ddbb211..452c9da 100644 --- a/CS2JLibrary/NetFramework/System/Text/Encoding.xml +++ b/CS2JLibrary/NetFramework/System/Text/Encoding.xml @@ -46,6 +46,18 @@ GetString System.String + + + new String(${buf}, ${this:16}.getString()) + + + System.Byte[] + buf + + + GetString + System.String + diff --git a/CS2JLibrary/src/CS2JNet/System/Collections/CSList.java b/CS2JLibrary/src/CS2JNet/System/Collections/CSList.java index a539090..f1ba44f 100644 --- a/CS2JLibrary/src/CS2JNet/System/Collections/CSList.java +++ b/CS2JLibrary/src/CS2JNet/System/Collections/CSList.java @@ -61,6 +61,10 @@ public class CSList implements ICollection, IEnumerable, Collection, } } + public CSList(Collection c){ + myList = new ArrayList(c); + } + public Iterator iterator() { return myList.iterator(); diff --git a/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailAddress.java b/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailAddress.java index 79abd45..4a591c7 100644 --- a/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailAddress.java +++ b/CS2JLibrary/src/CS2JNet/System/Net/Mail/MailAddress.java @@ -56,7 +56,7 @@ public class MailAddress { } public InternetAddress toInternetAddress() throws UnsupportedEncodingException { - return new InternetAddress(address, displayName); + return new InternetAddress(address, displayName, "utf-8"); } /** diff --git a/CS2JLibrary/src/CS2JNet/System/StringSupport.java b/CS2JLibrary/src/CS2JNet/System/StringSupport.java index acb0233..dd09731 100755 --- a/CS2JLibrary/src/CS2JNet/System/StringSupport.java +++ b/CS2JLibrary/src/CS2JNet/System/StringSupport.java @@ -128,7 +128,10 @@ public class StringSupport { } public static String Trim(String in, char[] filters, boolean trimStart, boolean trimEnd) - { + { + if(in == null){ + return null; + } // Locate first non-trimmable index int firstIdx = 0; if (trimStart) {