|
From: <jbo...@li...> - 2005-08-22 22:57:11
|
Author: szimano
Date: 2005-08-22 18:57:02 -0400 (Mon, 22 Aug 2005)
New Revision: 919
Modified:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
Log:
changes
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-22 22:56:48 UTC (rev 918)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-22 22:57:02 UTC (rev 919)
@@ -46,6 +46,10 @@
rResp.setRenderParameter("action", rReq.getParameter("action"));
}
+ if (rReq.getParameter("type") != null) {
+ rResp.setRenderParameter("type", rReq.getParameter("type"));
+ }
+
if (rReq.getParameter("version") != null) {
System.out.println("[process action]Getting page "
+ rReq.getParameter("page") + " at version "
@@ -193,15 +197,17 @@
} else {
page = "Wiki.jsp";
- if ((rReq.getParameter("action") != null)
- && (rReq.getParameter("action").equals("Diff"))) {
- wikiContext = new WikiContext(rReq.getUser(), wikiEngine
- .getWikiType("DIFF"), new PortletWikiSession(rReq.getPortletSession()));
- } else {
- wikiContext = new WikiContext(rReq.getUser(), wikiEngine
- .getWikiType("HTML"), new PortletWikiSession(rReq.getPortletSession()));
+ String type = "HTML";
+
+ if (rReq.getParameter("type") != null) {
+ type = rReq.getParameter("type");
+ System.out.println("Getting type: "+type);
}
+
+ wikiContext = new WikiContext(rReq.getUser(), wikiEngine
+ .getWikiType(type), new PortletWikiSession(rReq.getPortletSession()));
+
if (rReq.getParameter("version") != null) {
// show previous version of page
System.out.println("Getting page " + wikiPage + " at version "
|