jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r777960 - in /incubator/jspwiki/trunk: ./ src/java/org/apache/wiki/ src/java/org/apache/wiki/tags/ src/java/org/apache/wiki/ui/stripes/ src/java/org/apache/wiki/util/ tests/java/org/apache/wiki/
Date Sat, 23 May 2009 16:51:11 GMT
Author: metskem
Date: Sat May 23 16:51:11 2009
New Revision: 777960

URL: http://svn.apache.org/viewvc?rev=777960&view=rev
Log:
3.0.0-svn-121 Minor javadoc corrections and one JUnit test fix

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilter.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat May 23 16:51:11 2009
@@ -1,3 +1,8 @@
+2009-05-23  Harry Metske <metskem@apache.org>
+
+        * 3.0.0-svn-121
+        Minor javadoc corrections and one JUnit test fix
+        
 2009-05-23  Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 3.0.0-svn-120

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java Sat May 23 16:51:11
2009
@@ -244,7 +244,7 @@
 
     /**
      * {@inheritDoc}
-     * @see org.apache.wiki.WikiPage#getLastModified()
+     * @see org.apache.wiki.api.WikiPage#getLastModified()
      */
     public Date getLastModified()
     {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat May 23 16:51:11 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "120";
+    public static final String     BUILD         = "121";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/IteratorTag.java Sat May 23 16:51:11
2009
@@ -179,7 +179,7 @@
      * initialization code, to ensure that the iterator tag's internal state
      * initializes correctly. For subclasses that need to "pre-load" a default
      * collection of items, all that is needed is to have the overridden method
-     * call {@link #setList(Collection) or {@link #setList(Object[])}, then
+     * call {@link #setList(Collection)} or {@link #setList(Object[])}, then
      * call <code>super.doInitBody()</code>.
      * </p>
      * <p>
@@ -195,7 +195,7 @@
      * <code>m_items</code> contains one or more values, or
      * {@link javax.servlet.jsp.tagext.Tag#SKIP_BODY} if not.
      * 
-     * @see javax.servlet.jsp.tagext.Tag#doStartTag()}
+     * @see javax.servlet.jsp.tagext.Tag#doStartTag()
      *      </p>
      */
     public final int doStartTag()
@@ -239,7 +239,7 @@
     /**
      * {@inheritDoc}
      * calls
-     * {@link #resetIterator(), nulls out the internal iterator and wiki context
+     * {@link #resetIterator()}, nulls out the internal iterator and wiki context
      * references, and restores the WikiContext to its original state.     
      */
     public void release()
@@ -250,7 +250,7 @@
     /**
      * Resets the iterator to the first item in the list set by
      * {@link #setList(Collection)} or
-     * {@link #setList(Object[]). The default implementation sets the current record
+     * {@link #setList(Object[])}. The default implementation sets the current record
      * to the first one. Override this method to reset your own iterator.
      */
     public final void resetIterator()

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java Sat May 23 16:51:11
2009
@@ -149,7 +149,7 @@
      *  {@link javax.servlet.jsp.tagext.BodyTag#EVAL_BODY_BUFFERED}.
      *  Any exceptions that are thrown can then be dealt with by
      *  {@link #doCatch(Throwable)} or {@link #doFinally()}.
-     *  @see javax.servlet.jsp.tagext.Tag#doStartTag()}
+     *  @see javax.servlet.jsp.tagext.Tag#doStartTag()
      */
     public abstract int doWikiStartTag() throws Exception;
 
@@ -160,7 +160,7 @@
     }
     
     /**
-     * {@inheritDoc}
+     * 
      */
     public int doAfterBody() throws JspException 
     {
@@ -168,7 +168,7 @@
     }
     
     /**
-     * {@inheritDoc}
+     * 
      */
     public String getId()
     {
@@ -195,7 +195,6 @@
     }
 
     /**
-     * {@inheritDoc}
      * <p>The default implementation sanitizes the tag ID before setting
      * it by escaping potentially dangerous characters.</p>
      */

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilter.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilter.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilter.java
Sat May 23 16:51:11 2009
@@ -40,7 +40,7 @@
  * Intercepts HTTP requests intended for a "short URL" addresses and redirects
  * them to ActionBean URLs. Because this filter needs access to Stripes methods
  * to do its work, the <code>web.xml</code> file must configure the filter
- * order so that {@link StripesFilter} executes before this one.
+ * order so that {@link net.sourceforge.stripes.controller.StripesFilter} executes before
this one.
  * </p>
  * <p>
  * This filter exists purely to provide backwards-compatibility with URLs

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/util/PageTimeComparator.java Sat May
23 16:51:11 2009
@@ -89,7 +89,7 @@
     }
     
     /**
-     *  {@inheritDoc}
+     *
      */
     public int hashcode()
     {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java?rev=777960&r1=777959&r2=777960&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/WikiEngineTest.java Sat May 23 16:51:11
2009
@@ -862,7 +862,7 @@
         m_engine.saveText( "OldNameTestPage", "Linked to RenameBugTestPage" );
        
         Collection<WikiPath> pages = m_engine.getReferenceManager().getReferredBy(
WikiPath.valueOf("RenameBugTestPage") );
-        assertEquals( "has one", "Main:OldNameTestPage", pages.iterator().next() );
+        assertEquals( "has one", "Main:OldNameTestPage", pages.iterator().next().toString()
);
         
         WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( m_engine.getPage("OldNameTestPage")
);
         



Mime
View raw message