[jboss-svn-commits] JBL Code SVN: r35573 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2010-10-19 13:48:16 -0400 (Tue, 19 Oct 2010)
New Revision: 35573

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
Log:
GUVNOR-676 - Discussion comment line breaks are ignored


Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java	2010-10-19 17:37:18 UTC (rev 35572)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/DiscussionWidget.java	2010-10-19 17:48:16 UTC (rev 35573)
@@ -126,15 +126,30 @@
     }
 
     private Widget appendComment(DiscussionRecord r) {
-        SmallLabel hrd = new SmallLabel( Format.format( constants.smallCommentBy0On1Small(),
-                                                        r.author,
-                                                        new Date( r.timestamp ).toString() ) );
-        hrd.addStyleName( "discussion-header" );
-        commentList.add( hrd );
-        Label lbl = new Label( r.note );
-        lbl.setStyleName( "x-form-field" );
-        commentList.add( lbl );
-        commentList.add( new HTML( "<br/>" ) );
+        SmallLabel hrd = new SmallLabel(Format.format(constants.smallCommentBy0On1Small(), r.author, new Date(r.timestamp).toString()));
+        hrd.addStyleName("discussion-header");
+        commentList.add(hrd);
+        
+        String[] parts = r.note.split("\n");
+        
+        if(parts.length > 0) {
+        	String txt = "";
+        	for(int i=0;i<parts.length;i++) {
+        		txt += parts[i];
+        		if(i != parts.length-1) {
+        			txt += "<br/>";
+        		}
+        	}
+        	HTML hth = new HTML(txt);
+        	hth.setStyleName("x-form-field");
+        	commentList.add(hth);
+        } else {
+        	Label lbl = new Label(r.note);
+        	lbl.setStyleName("x-form-field");
+        	commentList.add(lbl);
+        }
+        
+        commentList.add(new HTML("<br/>"));
         return hrd;
     }