[jboss-svn-commits] JBL Code SVN: r10868 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/ui and 1 other directories.

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

Author: szimano
Date: 2007-04-10 18:01:29 -0400 (Tue, 10 Apr 2007)
New Revision: 10868

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java
Log:
wiki type version bug

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2007-04-10 21:12:22 UTC (rev 10867)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2007-04-10 22:01:29 UTC (rev 10868)
@@ -56,7 +56,6 @@
 import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
 import org.jboss.wiki.management.WikiServiceManagement;
 
-
 /**
  * A filter that enables to download files form the jspwiki structure +
  * redirects to pages by typing http://domain/wiki/Page
@@ -150,11 +149,12 @@
 
 			String requestURI = URLDecoder.decode(httpRequest.getRequestURI(),
 					"UTF-8");
-			
-			log.info("RequestURI: "+requestURI);
 
+			log.info("RequestURI: " + requestURI);
+
 			// get off "/wiki/" from the begining
-			requestURI = requestURI.substring((httpRequest.getContextPath() + "/").length());
+			requestURI = requestURI
+					.substring((httpRequest.getContextPath() + "/").length());
 
 			// support old type link with Wiki.jsp?page=
 			if (requestURI.equals("Wiki.jsp")) {
@@ -249,8 +249,7 @@
 			} else if (tokens[0].equals(WikiCommon.TINY_MCE)) {
 				chain.doFilter(request, response);
 				return;
-			}
-			else if (tokens[0].equals(WikiCommon.WIKI_BUTTONS)) {
+			} else if (tokens[0].equals(WikiCommon.WIKI_BUTTONS)) {
 				// show apropriate buttons
 				InputStream imageIS = WikiFileAccessFilter.class
 						.getResourceAsStream("/images/"
@@ -301,20 +300,32 @@
 
 						pageName = pageName.substring(1);
 
-						WikiPage page = wikiEngine.getByName(pageName,
-								new WikiContext(new SimpleCredentials(""),
-										wikiEngine.getWikiType(wikiTypeName),
-										wikiSession), langCode);
+						WikiPage page = null;
 
+						if (version != -1) {
+							page = wikiEngine.getByName(pageName,
+									new WikiContext(new SimpleCredentials(""),
+											wikiEngine
+													.getWikiType(wikiTypeName),
+											wikiSession), version, langCode);
+						} else {
+							page = wikiEngine.getByName(pageName,
+									new WikiContext(new SimpleCredentials(""),
+											wikiEngine
+													.getWikiType(wikiTypeName),
+											wikiSession), langCode);
+						}
+
 						httpResponse.setContentType(wikiEngine.getWikiType(
 								wikiTypeName).getContentType());
 
 						httpResponse.setContentLength(page.getPageContent()
 								.length());
-						
-						httpResponse.setCharacterEncoding(wikiEngine.getWikiType(
-								wikiTypeName).getCharacterEncoding());
 
+						httpResponse.setCharacterEncoding(wikiEngine
+								.getWikiType(wikiTypeName)
+								.getCharacterEncoding());
+
 						httpResponse.getWriter().print(page.getPageContent());
 
 						httpResponse.getWriter().flush();
@@ -347,9 +358,10 @@
 				WikiAttachment wikiAttachment;
 
 				if (version == -1) {
-					
-					log.info("Page: " + pageName+" File: "+fileName+" LangCode: "+langCode);
-					
+
+					log.info("Page: " + pageName + " File: " + fileName
+							+ " LangCode: " + langCode);
+
 					wikiAttachment = wikiEngine.getAttachment(pageName,
 							fileName, langCode);
 				} else {

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java	2007-04-10 21:12:22 UTC (rev 10867)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java	2007-04-10 22:01:29 UTC (rev 10868)
@@ -245,6 +245,7 @@
 				+ attrExtractor.getAppContext()
 				+ "/print/"
 				+ getCurrentPage().getName()
+				+ (attrExtractor.getPageVersion() != null ? ":" + getCurrentPage().getVersion() : "")
 				+ "', 'printerfriendly', 'menubar=no,toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=no,fullscreen=no,channelmode=no'); return false";
 
 		return print;

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java	2007-04-10 21:12:22 UTC (rev 10867)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/PrintPlugin.java	2007-04-10 22:01:29 UTC (rev 10868)
@@ -53,7 +53,7 @@
 		StringBuffer result = new StringBuffer(PRINT_PREF).append(
 				"<div style='font-size: 8pt;'><em>Printed by JBoss Wiki; <b>Page:</b> ").append(
 				wikiPage.getName()).append(" <b>Revision:</b> ").append(
-				wikiPage.getLastVersion()).append(" <b>Author:</b> ").append(
+				wikiPage.getVersion()).append(" <b>Author:</b> ").append(
 				wikiPage.getLastAuthor().getName()).append(" <b>Date:</b> ")
 				.append(wikiPage.getEditDate()).append(
 						"</em></div>\n<br/>").append(