[jboss-svn-commits] JBL Code SVN: r5299 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/ui resources/portal-forums-war/views/moderator resources/portal-forums-war/views/topics
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 26 16:43:57 EDT 2006
Author: unibrew
Date: 2006-07-26 16:43:51 -0400 (Wed, 26 Jul 2006)
New Revision: 5299
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-96] Finishing BBCode stuff.
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2006-07-26 20:43:51 UTC (rev 5299)
@@ -334,23 +334,30 @@
}
/**
- *
+ * Method used for parsing bbcode and return properly formated text of message.
* @return
*/
public static String formatMessage( String text , boolean allowHTML ) {
- Object req = FacesContext.getCurrentInstance().getExternalContext().getRequest();
- if (allowHTML)
- {
- getToHTMLRenderer(req).getConfig().setFilterMode(ToHTMLConfig.FILTER_MODE_ALWAYS_PRINT);
- getToHTMLRenderer(req).getConfig().setOuputMode(ToHTMLConfig.OUTPUT_MODE_REMOVE);
+ try {
+ Object req = FacesContext.getCurrentInstance().getExternalContext().getRequest();
+
+ if (allowHTML)
+ {
+ getToHTMLRenderer(req).getConfig().setFilterMode(ToHTMLConfig.FILTER_MODE_ALWAYS_PRINT);
+ getToHTMLRenderer(req).getConfig().setOuputMode(ToHTMLConfig.OUTPUT_MODE_REMOVE);
+ }
+ else
+ {
+ getToHTMLRenderer(req).getConfig().setFilterMode(ToHTMLConfig.FILTER_MODE_NEVER_PRINT);
+ getToHTMLRenderer(req).getConfig().setOuputMode(ToHTMLConfig.OUTPUT_MODE_REMOVE);
+ }
+ return formatTitle(req, text);
+ } catch (Exception e) {
+ //Now if something goes wrong it just returns message with bbcode.
+ return text;
}
- else
- {
- getToHTMLRenderer(req).getConfig().setFilterMode(ToHTMLConfig.FILTER_MODE_NEVER_PRINT);
- getToHTMLRenderer(req).getConfig().setOuputMode(ToHTMLConfig.OUTPUT_MODE_REMOVE);
- }
- return formatTitle(req, text);
+
}
/**
@@ -360,11 +367,12 @@
*/
public static String formatTitle(Object req, String text)
{
- StringWriter stringWriter = new StringWriter();
- getToHTMLRenderer(req).setWriter(stringWriter);
- System.out.println("REQ: "+req+" TEXT: "+text+" TOHTMLREND: "+getToHTMLRenderer(req));
- getToHTMLRenderer(req).render(text.toCharArray(), 0, text.length());
- return stringWriter.toString();
+
+ StringWriter stringWriter = new StringWriter();
+ getToHTMLRenderer(req).setWriter(stringWriter);
+ getToHTMLRenderer(req).render(text.toCharArray(), 0, text.length());
+ return stringWriter.toString();
+
}
/**
@@ -395,7 +403,6 @@
ToHTMLConfig config = new ToHTMLConfig();
config.setLoader(loader);
renderer = new ToHTMLRenderer(config, bundle);
- System.out.println("config: "+config+" loader:"+loader+" render"+renderer);
if (porReq!=null) {
porReq.getPortletSession().setAttribute("RENDERER", renderer);
} else if (serReq!=null){
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_split.xhtml 2006-07-26 20:43:51 UTC (rev 5299)
@@ -161,8 +161,7 @@
<td valign="top">
<hr size="1"/>
<span class="postbody">
- <!-- TODO: PROBLEM WITH THIS TAG!: #{forums:formatMessage(postrow.message.text,??false??)}-->
- ${postrow.message.text}
+ #{forums:formatMessage(postrow.message.text,false)}
<br /><br />
${postrow.poster.user.signature}
</span>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_edit_preview.xhtml 2006-07-26 20:43:51 UTC (rev 5299)
@@ -47,7 +47,9 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
- <span class="postbody">${editPost.message}</span>
+ <span class="postbody">
+ #{forums:formatMessage(editPost.message,false)}
+ </span>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_new_preview.xhtml 2006-07-26 20:43:51 UTC (rev 5299)
@@ -47,7 +47,9 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
- <span class="postbody">${newTopic.message}</span>
+ <span class="postbody">
+ #{forums:formatMessage(mewTopic.message,false)}
+ </span>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/posting_reply_preview.xhtml 2006-07-26 20:43:51 UTC (rev 5299)
@@ -47,7 +47,9 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
- <span class="postbody">${replyTopic.message}</span>
+ <span class="postbody">
+ #{forums:formatMessage(replyTopic.message,false)}
+ </span>
</td>
</tr>
</table>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-07-26 19:32:21 UTC (rev 5298)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-07-26 20:43:51 UTC (rev 5299)
@@ -307,8 +307,7 @@
<tr>
<td colspan="2">
<span class="postbody">
- <!-- TODO: PROBLEM WITH THIS TAG!: #{forums:formatMessage(postrow.message.text,??false??)}-->
- ${postrow.message.text}
+ #{forums:formatMessage(postrow.message.text,false)}
<br /><br />
${postrow.poster.user.signature}
</span>
More information about the jboss-svn-commits
mailing list