diff --git a/CS2JLibrary/.classpath b/CS2JLibrary/.classpath index e4b673d..1113fa7 100644 --- a/CS2JLibrary/.classpath +++ b/CS2JLibrary/.classpath @@ -2,7 +2,6 @@ - - + diff --git a/CS2JLibrary/NetTranslations/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml b/CS2JLibrary/NetTranslations/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml index 05b066b..f9fb2fe 100644 --- a/CS2JLibrary/NetTranslations/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml +++ b/CS2JLibrary/NetTranslations/ICSharpCode/SharpZipLib/Zip/ZipEntry.xml @@ -16,5 +16,10 @@ Name ${this}.getName() + + System.Boolean + IsDirectory + ${this}.isDirectory() + \ No newline at end of file diff --git a/CS2JLibrary/NetTranslations/System/Boolean.xml b/CS2JLibrary/NetTranslations/System/Boolean.xml index 2bb680b..42d9fdb 100755 --- a/CS2JLibrary/NetTranslations/System/Boolean.xml +++ b/CS2JLibrary/NetTranslations/System/Boolean.xml @@ -20,17 +20,6 @@ TrueString "True" - - - System.Boolean - HasValue - ${this} != null - - - System.Boolean - Value - ${this} - diff --git a/CS2JLibrary/NetTranslations/System/Char.xml b/CS2JLibrary/NetTranslations/System/Char.xml index 28f4d37..224b72c 100755 --- a/CS2JLibrary/NetTranslations/System/Char.xml +++ b/CS2JLibrary/NetTranslations/System/Char.xml @@ -50,17 +50,6 @@ Character.isLetter(${ch}) - System.Boolean - IsLetterOrDigit - - - System.Char - ch - - - Character.isLetterOrDigit(${ch}) - - System.Boolean IsUpper diff --git a/CS2JLibrary/NetTranslations/System/Convert.xml b/CS2JLibrary/NetTranslations/System/Convert.xml index 6d9d27f..44390f8 100755 --- a/CS2JLibrary/NetTranslations/System/Convert.xml +++ b/CS2JLibrary/NetTranslations/System/Convert.xml @@ -14,34 +14,6 @@ - - System.Byte[] - FromBase64String - - - System.String - s - - - - org.apache.commons.codec.binary.Base64 - - Base64.decodeBase64(${s}) - - - System.String - ToBase64String - - - System.Byte[] - inArray - - - - org.apache.commons.codec.binary.Base64 - - Base64.encodeBase64String(${inArray}) - System.Boolean ToBoolean diff --git a/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml b/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml index b2f3494..e53667d 100755 --- a/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml +++ b/CS2JLibrary/NetTranslations/System/IO/StreamReader.xml @@ -67,10 +67,9 @@ RusticiSoftware.System.IO.StreamReader - RusticiSoftware.System.Text.EncodingSupport java.io.* - new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), new EncodingSupport("UTF-8"))) + new BufferedReader(StreamReader.make(new BufferedInputStream(${stream}), "UTF-8")) diff --git a/CS2JLibrary/NetTranslations/System/Net/Mail/MailAddressCollection.xml b/CS2JLibrary/NetTranslations/System/Net/Mail/MailAddressCollection.xml new file mode 100644 index 0000000..bbc5e87 --- /dev/null +++ b/CS2JLibrary/NetTranslations/System/Net/Mail/MailAddressCollection.xml @@ -0,0 +1,15 @@ + + + System.Net.Mail.MailAddressCollection + + + + System.Int32 + Count + ${this}.size() + + + diff --git a/CS2JLibrary/NetTranslations/System/Number.xml b/CS2JLibrary/NetTranslations/System/Number.xml index 21ec44c..3fcb47c 100755 --- a/CS2JLibrary/NetTranslations/System/Number.xml +++ b/CS2JLibrary/NetTranslations/System/Number.xml @@ -20,20 +20,6 @@ NumberFormat.getInstance(${provider}).format(${this}) - - System.String - ToString - - - System.String - format - - - - RusticiSoftware.System.NumberSupport - - NumberSupport.format(${this}, ${format}) - diff --git a/CS2JLibrary/NetTranslations/System/Security/Cryptography/X509Certificates/X509Certificate2.xml b/CS2JLibrary/NetTranslations/System/Security/Cryptography/X509Certificates/X509Certificate2.xml deleted file mode 100644 index 3d070c7..0000000 --- a/CS2JLibrary/NetTranslations/System/Security/Cryptography/X509Certificates/X509Certificate2.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - System.Security.Cryptography.X509Certificates.X509Certificate2 - - System.Security.Cryptography.X509Certificates.X509Certificate - - X509Certificate - - java.security.cert.X509Certificate - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CS2JLibrary/NetTranslations/System/String.xml b/CS2JLibrary/NetTranslations/System/String.xml index c780d75..27cc26c 100755 --- a/CS2JLibrary/NetTranslations/System/String.xml +++ b/CS2JLibrary/NetTranslations/System/String.xml @@ -14,19 +14,16 @@ - - char - System.Char - length System.Int32 + + char + System.Char + - - RusticiSoftware.System.StringSupport - - StringSupport.mkString(${char}, ${length}) + new String(${length}, ${char}) /* FIX ME */ diff --git a/CS2JLibrary/NetTranslations/System/Text/Encoding.xml b/CS2JLibrary/NetTranslations/System/Text/Encoding.xml index b9dd89d..9afa448 100755 --- a/CS2JLibrary/NetTranslations/System/Text/Encoding.xml +++ b/CS2JLibrary/NetTranslations/System/Text/Encoding.xml @@ -9,23 +9,9 @@ UTF8 System.Text.Encoding - (new EncodingSupport("UTF-8")) - - RusticiSoftware.System.Text.EncodingSupport - + "UTF-8" - - System.Byte[] - GetBytes - - - System.String - s - - - ${this}.getBytes(${s}) - diff --git a/CS2JLibrary/NetTranslations/System/Text/StringBuilder.xml b/CS2JLibrary/NetTranslations/System/Text/StringBuilder.xml index e9f0077..37749a6 100755 --- a/CS2JLibrary/NetTranslations/System/Text/StringBuilder.xml +++ b/CS2JLibrary/NetTranslations/System/Text/StringBuilder.xml @@ -24,16 +24,7 @@ Length System.Int32 ${this}.length() - StringBuilderSupport.setLength(${this}, ${value}) - - RusticiSoftware.System.Text.StringBuilderSupport - - - - Capacity - System.Int32 - ${this}.capacity() - ${this}.ensureCapacity(${value}) + ${this}.setlength(${value}) @@ -59,20 +50,6 @@ ${this}.append((${arg}) + System.getProperty("line.separator")) - - System.Int32 - EnsureCapacity - - - arg - System.Int32 - - - - RusticiSoftware.System.Text.StringBuilderSupport - - StringBuilderSupport.ensureCapacity(${this}, ${arg}) - System.Text.StringBuilder Insert diff --git a/CS2JLibrary/build.properties b/CS2JLibrary/build.properties index a3f0677..a78b57a 100755 --- a/CS2JLibrary/build.properties +++ b/CS2JLibrary/build.properties @@ -6,4 +6,4 @@ classes.dir=${build.dir}/classes jar.dir=${build.dir}/jar zip.dir=${build.dir}/zip java.target.vm=1.5 - +src.zip=${zip.dir}/cs2jlibrary-src.zip \ No newline at end of file diff --git a/CS2JLibrary/build.xml b/CS2JLibrary/build.xml index 8a8e7ef..4d69c1c 100755 --- a/CS2JLibrary/build.xml +++ b/CS2JLibrary/build.xml @@ -50,10 +50,6 @@ - - - - diff --git a/CS2JLibrary/lib/LICENSE-Apache2.0.txt b/CS2JLibrary/lib/LICENSE-commons-lang.txt similarity index 98% rename from CS2JLibrary/lib/LICENSE-Apache2.0.txt rename to CS2JLibrary/lib/LICENSE-commons-lang.txt index 75b5248..d645695 100644 --- a/CS2JLibrary/lib/LICENSE-Apache2.0.txt +++ b/CS2JLibrary/lib/LICENSE-commons-lang.txt @@ -1,202 +1,202 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/CS2JLibrary/lib/NOTICE-commons-codec.txt b/CS2JLibrary/lib/NOTICE-commons-codec.txt deleted file mode 100644 index 6aee73e..0000000 --- a/CS2JLibrary/lib/NOTICE-commons-codec.txt +++ /dev/null @@ -1,14 +0,0 @@ -Apache Commons Codec -Copyright 2002-2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - --------------------------------------------------------------------------------- -src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains -test data from http://aspell.sourceforge.net/test/batch0.tab. - -Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying -and distribution of this entire article is permitted in any medium, -provided this notice is preserved. --------------------------------------------------------------------------------- diff --git a/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt b/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt deleted file mode 100644 index e3b7ea9..0000000 --- a/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt +++ /dev/null @@ -1,5 +0,0 @@ -3rd Party Software License - -commons-lang, commons-codec Apache 2.0 - - \ No newline at end of file diff --git a/CS2JLibrary/lib/commons-codec-1.4.jar b/CS2JLibrary/lib/commons-codec-1.4.jar deleted file mode 100644 index 458d432..0000000 Binary files a/CS2JLibrary/lib/commons-codec-1.4.jar and /dev/null differ diff --git a/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java b/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java index 7c6ea95..ccd26ab 100644 --- a/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java @@ -24,10 +24,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.ArrayList; +import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction; public class FieldSupport { - public static Annotation[] getAnnotations(Field f, Class filterBy, boolean inherits) + public static Annotation[] getAnnotations(Field f, Class filterBy, boolean inherits) { ArrayList filteredAnns = new ArrayList(); diff --git a/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java b/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java index 963b773..ef6509e 100755 --- a/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java @@ -31,14 +31,14 @@ public class LocaleSupport { // singleton private LocaleSupport() {} - private static ThreadLocal threadLocal = new InheritableThreadLocal(); + private static ThreadLocal threadLocal = new InheritableThreadLocal(); public static void setCurrentLocale(Locale locale) { threadLocal.set(locale); } public static Locale getCurrentLocale() { - Locale locale = threadLocal.get(); + Locale locale = (Locale) threadLocal.get(); if (locale == null) { return Locale.getDefault(); diff --git a/CS2JLibrary/src/RusticiSoftware/System/DateTimeSupport.java b/CS2JLibrary/src/RusticiSoftware/System/DateTimeSupport.java index 0a754ba..01aade4 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/DateTimeSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/DateTimeSupport.java @@ -1,28 +1,28 @@ -/* - Copyright 2007-2010 Rustici Software, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Author(s): - - Kevin Glynn (kevin.glynn@scorm.com) -*/ - +/* + Copyright 2007-2010 Rustici Software, LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author(s): + + Kevin Glynn (kevin.glynn@scorm.com) +*/ + package RusticiSoftware.System; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; +import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -125,14 +125,14 @@ public class DateTimeSupport { } throw new ParseException("Could not parse " + s + " as a date", 0); - } - - public static Date add(Date base,int field, int amount) - { - Calendar cal = Calendar.getInstance(); - cal.setTime(base); - cal.add(field, amount); - return cal.getTime(); + } + + public static Date add(Date base,int field, int amount) + { + Calendar cal = Calendar.getInstance(); + cal.setTime(base); + cal.add(field, amount); + return cal.getTime(); } } \ No newline at end of file diff --git a/CS2JLibrary/src/RusticiSoftware/System/DoubleSupport.java b/CS2JLibrary/src/RusticiSoftware/System/DoubleSupport.java index 6fee1cd..25a61d4 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/DoubleSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/DoubleSupport.java @@ -33,7 +33,7 @@ public class DoubleSupport { String formattedValue = ""; - if (format.toLowerCase().indexOf("g") == 0 && format.length() < 3) { + if ((format.toLowerCase().indexOf("g") == 0 || format.toLowerCase().indexOf("n") == 0) && format.length() < 3) { if (format.length() == 2) { String lengthStr = format.substring(1); diff --git a/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java b/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java index 9be6652..a001c1a 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java @@ -23,12 +23,12 @@ package RusticiSoftware.System; public class EnumSupport { // returns true iff v is a valid ordinal position of a enum in e - public static boolean isDefined(Class e, int v) + public static boolean isDefined(Class e, int v) { return (v >= 0 && v < e.getEnumConstants().length); } - public static String toString(Enum e, String m) + public static String toString(Enum e, String m) { if ("D".equals(m)) { diff --git a/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java b/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java index a9b71e9..dedc026 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java @@ -121,7 +121,7 @@ public class DirectorySupport { // In .Net Directory.GetFiles, if the searchpattern contains directory path separators // then it will search subdirs. - ArrayList allMatches = new ArrayList(); + ArrayList allMatches = new ArrayList(); // we split on both / and \ characters String[] patternComponents = searchpattern.split("[/\\\\]",2); @@ -145,7 +145,7 @@ public class DirectorySupport { } } - return allMatches.toArray(new String[allMatches.size()]); + return (String[])allMatches.toArray(new String[allMatches.size()]); } @@ -177,7 +177,7 @@ public class DirectorySupport { for (int i=0; i ret_al = new ArrayList(Arrays.asList(rets)); + ArrayList ret_al = new ArrayList(Arrays.asList(rets)); ret_al.add(""); - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); } return rets; } @@ -248,9 +248,9 @@ public class StringSupport { if (str.endsWith(c1+"") || str.endsWith(c2+"")) { // Add empty string for .Net - ArrayList ret_al = new ArrayList(Arrays.asList(rets)); + ArrayList ret_al = new ArrayList(Arrays.asList(rets)); ret_al.add(""); - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); } return rets; } @@ -265,16 +265,16 @@ public class StringSupport { if (options != StringSplitOptions.RemoveEmptyEntries && str.endsWith(c+"")) { // Add empty string for .Net - ArrayList ret_al = new ArrayList(Arrays.asList(rets)); + ArrayList ret_al = new ArrayList(Arrays.asList(rets)); ret_al.add(""); - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); break; } } if (options == StringSplitOptions.RemoveEmptyEntries) { - ArrayList ret_al = new ArrayList(); + ArrayList ret_al = new ArrayList(); for (String p : rets) { if (!p.equals("")) @@ -282,7 +282,7 @@ public class StringSupport { ret_al.add(p); } } - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); } return rets; @@ -297,16 +297,16 @@ public class StringSupport { if (options != StringSplitOptions.RemoveEmptyEntries && str.endsWith(s)) { // Add empty string for .Net - ArrayList ret_al = new ArrayList(Arrays.asList(rets)); + ArrayList ret_al = new ArrayList(Arrays.asList(rets)); ret_al.add(""); - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); break; } } if (options == StringSplitOptions.RemoveEmptyEntries) { - ArrayList ret_al = new ArrayList(); + ArrayList ret_al = new ArrayList(); for (String p : rets) { if (!p.equals("")) @@ -314,7 +314,7 @@ public class StringSupport { ret_al.add(p); } } - rets = ret_al.toArray(new String [ret_al.size()]); + rets = (String[])ret_al.toArray(new String [ret_al.size()]); } return rets; @@ -327,6 +327,19 @@ public class StringSupport { public static final boolean IsNullOrEmpty(String str){ return isNullOrEmpty(str); + } + + public static final boolean IsEmptyOrBlank(String str){ + // Locate first non-trimmable index + int firstIdx = 0; + while (firstIdx < str.length()) + { + if (isIn(str.charAt(firstIdx),wschars)) + firstIdx++; + else + break; + } + return firstIdx == str.length(); } public static final int lastIndexOfAny(String str, char[] anyOf) @@ -334,19 +347,10 @@ public class StringSupport { int index = -1; for (char test : anyOf) { - index = Math.max(index, str.indexOf(test)); + index = Math.max(index, str.lastIndexOf(test)); } return index; } - - // in C# new String('x',50) - public static String mkString(char c, int count) { - char[] chars = new char[count]; - for (int i = 0; i < count; i++) { - chars[i] = c; - } - return new String(chars); - } public static void Testmain(String[] args) { @@ -382,7 +386,5 @@ public class StringSupport { splitFred = Split("=fred",'='); System.out.println("Split(\"=fred\", '=') = [\"" + splitFred[0] + "\", \"" + splitFred[1] + "\"]"); -} - - +} } diff --git a/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java b/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java deleted file mode 100644 index 05a7a6a..0000000 --- a/CS2JLibrary/src/RusticiSoftware/System/Text/EncodingSupport.java +++ /dev/null @@ -1,19 +0,0 @@ -package RusticiSoftware.System.Text; - -import java.io.UnsupportedEncodingException; - -public class EncodingSupport { - - private String coding = "utf-8"; - public EncodingSupport(String coding) { - this.coding = coding; - } - - public byte[] getBytes(String input) throws UnsupportedEncodingException { - return input.getBytes(coding); - } - - public String getString() { - return coding; - } -} diff --git a/CS2JLibrary/src/RusticiSoftware/System/Text/StringBuilderSupport.java b/CS2JLibrary/src/RusticiSoftware/System/Text/StringBuilderSupport.java deleted file mode 100644 index bee6ae6..0000000 --- a/CS2JLibrary/src/RusticiSoftware/System/Text/StringBuilderSupport.java +++ /dev/null @@ -1,24 +0,0 @@ -package RusticiSoftware.System.Text; - -public class StringBuilderSupport { - - // In C# ensureCapacity returns the new capacity - public static int ensureCapacity(StringBuilder sb, int capacity) { - sb.ensureCapacity(capacity); - return sb.capacity(); - } - // In C# setLength pads with spaces - public static void setLength(StringBuilder sb, int newLen) { - if (sb.length() >= newLen) { - sb.setLength(newLen); - } - sb.append(String.format("%1$-" + (newLen - sb.length()) + "s", "")); - } - - public static void main(String[] args) { - StringBuilder sb = new StringBuilder("hello"); - System.out.println("**" + sb + "**"); - StringBuilderSupport.setLength(sb,7); - System.out.println("**" + sb + "**"); - } -} diff --git a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlDocument.java b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlDocument.java index 821fca0..80a26c7 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlDocument.java +++ b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlDocument.java @@ -1,23 +1,23 @@ -/* - Copyright 2007-2010 Rustici Software, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Author(s): - - Kevin Glynn (kevin.glynn@scorm.com) -*/ - +/* + Copyright 2007-2010 Rustici Software, LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author(s): + + Kevin Glynn (kevin.glynn@scorm.com) +*/ + package RusticiSoftware.System.Xml; import javax.xml.parsers.*; @@ -36,7 +36,7 @@ import java.io.StringReader; import java.util.logging.Level; import java.util.logging.Logger; -import org.w3c.dom.DOMImplementation; +import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; public class XmlDocument extends XmlNode { @@ -44,11 +44,11 @@ public class XmlDocument extends XmlNode { private static Logger logger = Logger.getLogger("com.rusticisoftware.scormcontentplayer"); public XmlDocument() throws ParserConfigurationException - { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = factory.newDocumentBuilder(); - DOMImplementation impl = builder.getDOMImplementation(); - + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + DOMImplementation impl = builder.getDOMImplementation(); + Document doc = impl.createDocument(null,null,null); setNode(doc); } @@ -82,12 +82,12 @@ public class XmlDocument extends XmlNode { DocumentBuilder builder = factory.newDocumentBuilder(); setNode(builder.parse(r)); } - + // overload for translation from .net, which treats load() as namespace aware - public void load(InputStream r) throws ParserConfigurationException, SAXException, IOException - { - load(r,true); - } + public void load(InputStream r) throws ParserConfigurationException, SAXException, IOException + { + load(r,true); + } public void loadXml(String content) throws ParserConfigurationException, SAXException, IOException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); diff --git a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlNode.java b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlNode.java index 2a5685f..71f5ec6 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlNode.java +++ b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlNode.java @@ -1,23 +1,23 @@ -/* - Copyright 2007-2010 Rustici Software, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Author(s): - - Kevin Glynn (kevin.glynn@scorm.com) -*/ - +/* + Copyright 2007-2010 Rustici Software, LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author(s): + + Kevin Glynn (kevin.glynn@scorm.com) +*/ + package RusticiSoftware.System.Xml; import java.io.IOException; @@ -27,6 +27,8 @@ import java.util.Iterator; import org.w3c.dom.*; import org.xml.sax.InputSource; import org.xml.sax.SAXException; + +import RusticiSoftware.System.StringSupport; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -179,6 +181,19 @@ public class XmlNode implements Iterable { // I think the XML standard says that newlines in text are converted from their // local encoding to "\n". Java does that, but .Net does not, so here we put 'em back. return node.getTextContent().replace("\n", System.getProperty("line.separator")); + } + + public boolean isEmptyElement() + { + if (StringSupport.IsEmptyOrBlank(node.getTextContent()) && getAttributes().size() == 0 && getChildNodes().size() == 0) + { + return true; + } + else + { + return false; + } + } // This is a .Net extension to the DOM. It returns markup describing diff --git a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlTextReader.java b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlTextReader.java index 6808178..6b9eabf 100644 --- a/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlTextReader.java +++ b/CS2JLibrary/src/RusticiSoftware/System/Xml/XmlTextReader.java @@ -1,23 +1,23 @@ -/* - Copyright 2007-2010 Rustici Software, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Author(s): - - Kevin Glynn (kevin.glynn@scorm.com) -*/ - +/* + Copyright 2007-2010 Rustici Software, LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author(s): + + Kevin Glynn (kevin.glynn@scorm.com) +*/ + package RusticiSoftware.System.Xml; import java.io.IOException; @@ -32,12 +32,12 @@ import RusticiSoftware.System.NotImplementedException; public class XmlTextReader { protected XmlDocument xmlDocument = null; - - protected XmlDocument getXmlDocument() throws ParserConfigurationException { - if (xmlDocument == null) { - xmlDocument = new XmlDocument(); - } - return xmlDocument; + + protected XmlDocument getXmlDocument() throws ParserConfigurationException { + if (xmlDocument == null) { + xmlDocument = new XmlDocument(); + } + return xmlDocument; } public XmlTextReader() throws NotImplementedException { throw new NotImplementedException(); diff --git a/CS2JLibrary/src/RusticiSoftware/System/Xml/Xsl/XslTransform.java b/CS2JLibrary/src/RusticiSoftware/System/Xml/Xsl/XslTransform.java index e592839..4696496 100644 --- a/CS2JLibrary/src/RusticiSoftware/System/Xml/Xsl/XslTransform.java +++ b/CS2JLibrary/src/RusticiSoftware/System/Xml/Xsl/XslTransform.java @@ -1,31 +1,31 @@ -/* - Copyright 2007-2010 Rustici Software, LLC - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - Author(s): - - Kevin Glynn (kevin.glynn@scorm.com) -*/ - +/* + Copyright 2007-2010 Rustici Software, LLC + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author(s): + + Kevin Glynn (kevin.glynn@scorm.com) +*/ + package RusticiSoftware.System.Xml.Xsl; // // This is now a wrapper for XslCompiledTransform because that has superseded XslTransform going to .Net 2.0 import java.io.StringWriter; import java.io.StringReader; - -import javax.xml.parsers.ParserConfigurationException; + +import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.Transformer;