commit fcdd82a4b4958e4e904f3b6e839af7eadd9a64db
author Judith Gull <jgu@bsiag.com> Wed Dec 23 10:10:13 2015 +0100
committer Judith Gull <jgu@bsiag.com> Mon Dec 28 07:36:24 2015 -0500
tree 4d1259cf6fb871b3a7ecee150000cd208c31736a
parent d90259ed6ae56cea88b521c69e27b8f7108bd2f7

fix \r\n instead of \n\r

Change-Id: I756595239ef87b180d64ed2cba22304645bdc536
Reviewed-on: https://git.eclipse.org/r/63198
Tested-by: Hudson CI
Reviewed-by: Judith Gull <jgu@bsiag.com>

org.eclipse.scout.commons/src/org/eclipse/scout/commons/StringUtility.java

diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/StringUtility.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/StringUtility.java
index f05ed3e..c6465e4 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/StringUtility.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/StringUtility.java
@@ -878,7 +878,7 @@
     s = s.replace("'", "'");
     s = s.replace("<", "&lt;");
     s = s.replace(">", "&gt;");
-    s = s.replace("\n\r", "<br/>");
+    s = s.replace("\r\n", "<br/>");
     s = s.replace("\n", "<br/>");
 
     // temporarily replace tabs with specific tab-identifier to not be replaced by subsequent whitespace pattern
@@ -1689,7 +1689,7 @@
   /**
    * Creates a new string repeating the <code>token</code> <code>repetitions</code> times. If <code>repetitions</code>
    * <= 0 an empty string is returned.
-   * 
+   *
    * @param token
    * @param repetitions
    */
@@ -1704,7 +1704,7 @@
   /**
    * Similar to {@link #nvl(Object, String)} but returns <code>valueWhenEmpty</code> not only if value is null, but as
    * well when the String representation of <code>value</code> is empty or contains only whitespaces.
-   * 
+   *
    * @param property
    * @param string
    * @return