From d825e3c3480769d71a9db0b119f0a24bcd94a919 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Thu, 26 Aug 2010 12:54:07 +0200 Subject: [PATCH] Merge from rustici/trunk: ------------------------------------------------------------------------ r13498 | ben.clark | 2010-08-20 23:04:52 +0200 (Fri, 20 Aug 2010) | 1 line support for trimmed empty check w/o performing trim (avoid associated copy) ------------------------------------------------------------------------ r13354 | ben.clark | 2010-08-04 23:34:47 +0200 (Wed, 04 Aug 2010) | 1 line fix for ontime 334, 'N#' format support ------------------------------------------------------------------------ r13303 | ben.clark | 2010-08-02 18:53:11 +0200 (Mon, 02 Aug 2010) | 1 line fixed infinite loop in recurive directory delete ------------------------------------------------------------------------ r13222 | ben.clark | 2010-07-22 16:09:51 +0200 (Thu, 22 Jul 2010) | 1 line need to know if an entry is a directory or not, to avoid writing directory entries as files ------------------------------------------------------------------------ r13200 | ben.clark | 2010-07-20 16:13:11 +0200 (Tue, 20 Jul 2010) | 1 line merged back lastindexofany fix ------------------------------------------------------------------------ r12990 | ben.clark | 2010-06-22 04:44:58 +0200 (Tue, 22 Jun 2010) | 1 line new translation needed for PENS --- .../ICSharpCode/SharpZipLib/Zip/ZipEntry.xml | 5 +++++ .../System/Net/Mail/MailAddressCollection.xml | 15 +++++++++++++++ .../src/RusticiSoftware/System/DoubleSupport.java | 2 +- .../System/IO/DirectorySupport.java | 2 +- .../src/RusticiSoftware/System/StringSupport.java | 15 ++++++++++++++- .../src/RusticiSoftware/System/Xml/XmlNode.java | 15 +++++++++++++++ 6 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 CS2JLibrary/NetTranslations/System/Net/Mail/MailAddressCollection.xml 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/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/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/IO/DirectorySupport.java b/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java index a9b71e9..d880ce4 100755 --- a/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java +++ b/CS2JLibrary/src/RusticiSoftware/System/IO/DirectorySupport.java @@ -177,7 +177,7 @@ public class DirectorySupport { for (int i=0; i