From 9c00b08fd71ffa6f344364f4e6781d449b4af2c4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 27 Nov 2009 10:32:16 +0000
Subject: [PATCH] Fix for issue 4372 (control-panel output is on one line on copy) Use a workaround for bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4988885 by adding a &#10; character.

---
 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index cfc7c85..2fc8844 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -280,6 +280,7 @@
       msg = Utilities.applyFont(msg+"<br>", ColorAndFontConstants.progressFont);
       try
       {
+        msg = filterForBugID4988885(msg);
         doc.insertBeforeStart(doc.getElement(LASTID), msg);
       }
       catch (Throwable t)
@@ -320,6 +321,7 @@
 
       try
       {
+        msg = filterForBugID4988885(msg);
         doc.insertBeforeStart(doc.getElement(LASTID), msg);
       }
       catch (Throwable t)
@@ -619,4 +621,15 @@
       }
     }
   }
+
+  /**
+   * This is necessary because of bug 4988885.
+   * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4988885
+   * @param msg the message.
+   * @return the message filtered.
+   */
+  private static String filterForBugID4988885(String msg)
+  {
+    return msg.replaceAll("<br>", "<br>&#10;");
+  }
 }

--
Gitblit v1.10.0