svn commit: r826317 - in /incubator/jspwiki/trunk: src/java/org/apache/wiki/WikiEngine.java src/java/org/apache/wiki/content/ContentManager.java tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java

[ajaquith]

Author: ajaquith
Date: Sat Oct 17 22:49:04 2009
New Revision: 826317

URL: http://svn.apache.org/viewvc?rev=826317&view=rev
Log:
Fixed JSPWikiMarkupParser rendering speed test and a few Javadocs. No version 
bump.

Modified:
    incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
    
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java?rev=826317&r1=826316&r2=826317&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiEngine.java Sat Oct 17 
22:49:04 2009
@@ -1869,7 +1869,8 @@
     }
 
     /**
-     *  Creates a new WikiPage object.
+     *  Creates a new WikiPage object without saving it to the repository.
+     *  To save the page, call {...@link WikiPage#save()}.
      *  
      *  @param name the WikiName of the object to create
      *  @return a new WikiPage object

Modified: 
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java?rev=826317&r1=826316&r2=826317&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java 
(original)
+++ 
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ContentManager.java 
Sat Oct 17 22:49:04 2009
@@ -1455,7 +1455,7 @@
     }
     
     /**
-     *  Adds new content to the repository.  To update, get a page, modify
+     *  Adds new content to the repository without saving it. To update, get a 
page, modify
      *  it, then store it back using save().
      *  
      *  @param path the WikiName
@@ -1470,7 +1470,7 @@
     }
 
     /**
-     *  Add new content to the repository to a particular JCR path.
+     *  Add new content to the repository to a particular JCR path, without 
saving it.
      *  
      *  @param path
      *  @param jcrPath

Modified: 
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java?rev=826317&r1=826316&r2=826317&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
 (original)
+++ 
incubator/jspwiki/trunk/tests/java/org/apache/wiki/parser/JSPWikiMarkupParserTest.java
 Sat Oct 17 22:49:04 2009
@@ -2327,7 +2327,14 @@
     {
         Benchmark sw = new Benchmark();
         sw.start();
+        
+        // Create the page and save it to disk.
+        if ( !testEngine.pageExists( PAGE_NAME ) )
+        {
+            testEngine.saveText( PAGE_NAME, brokenPageText );
+        }
 
+        // Test the rendering speed
         for( int i = 0; i < 100; i++ )
         {
             translate( brokenPageText );