[Jboss-svn-commits] JBL Code SVN: r911 - trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki

[<jbo...@li...>]

Author: szimano
Date: 2005-08-22 04:26:41 -0400 (Mon, 22 Aug 2005)
New Revision: 911

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
Log:
changed history


Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-21 08:18:40 UTC (rev 910)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-22 08:26:41 UTC (rev 911)
@@ -271,33 +271,40 @@
 		return false;
 	}
 
-	public WikiPage getPageAtVersion(String pageName, String languageCode,
+	public WikiPage getPageAtVersion(WikiPage originPage, String languageCode,
 			int version) {
 		if (languageCode != null) {
 			System.out
 					.println("As for now, languages aren't supported in the wiki. Please do not use language codes");
 		}
 
-		return getPageAtVersion(pageName, version);
+		return getPageAtVersion(originPage, version);
 	}
 
-	public WikiPage getPageAtVersion(String pageName, int version) {
-		WikiPage page = getPage(pageName);
-
+	public WikiPage getPageAtVersion(WikiPage originPage, int version) {
+		WikiPage page = null;
+		
+		try {
+			page = (WikiPage)originPage.clone();
+		}
+		catch (CloneNotSupportedException e) {
+			System.err.println(e);
+		}
+		
 		if (page != null) {
 			if (page.getLastVersion() < version) {
 				System.out.println("There is no version " + version
-						+ " of page " + pageName);
+						+ " of page " + page.getName());
 				return null;
 			}
 
-			page.setPageContent(getContentAtVersion(pageName, version));
+			page.setPageContent(getContentAtVersion(page.getName(), version));
 
-			page.setLastAuthor(getAuthorAtVersion(pageName, version));
+			page.setLastAuthor(getAuthorAtVersion(page.getName(), version));
 			
 			page.setVersion(version);
 
-			page.setEditDate(getDateAtVersion(pageName, version));
+			page.setEditDate(getDateAtVersion(page.getName(), version));
 
 		}
 		return page;
@@ -341,7 +348,7 @@
 				version + ".author"));
 	}
 
-	public static void main(String[] args) {
+	/*public static void main(String[] args) {
 		MediaDataSource fds = new FileDataSource();
 
 		String[] pageName = { "Rali", "Tomek", "Adam", "Dupa",
@@ -382,7 +389,7 @@
 			System.out
 					.println("Page WhatIsJBossForge doesn't exist at version 70");
 		}
-	}
+	}*/
 
 	public boolean pageExists(String pageName) {
 		File pageFile = new File(pathToMedia + "/" + pageName + ".txt");

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-21 08:18:40 UTC (rev 910)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-22 08:26:41 UTC (rev 911)
@@ -76,9 +76,9 @@
  */
     public WikiPage getPage(String pageName, String languageCode);
     
-    public WikiPage getPageAtVersion(String pageName, String languageCode, int version);
+    public WikiPage getPageAtVersion(WikiPage originPage, String languageCode, int version);
     
-    public WikiPage getPageAtVersion(String pageName, int version);
+    public WikiPage getPageAtVersion(WikiPage originPage, int version);
     
     public boolean pageExists(String pageName);
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java	2005-08-21 08:18:40 UTC (rev 910)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java	2005-08-22 08:26:41 UTC (rev 911)
@@ -196,7 +196,7 @@
 			return this;
 		}
 		else {
-			return mediaDataSource.getPageAtVersion(name,version);
+			return mediaDataSource.getPageAtVersion(this,version);
 		}
 	}