svn commit: r1512377 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/tags/ main/java/org/apache/wiki/ui/ test/java/org/apache/wiki/search/

[metskem]

Author: metskem
Date: Fri Aug  9 16:20:27 2013
New Revision: 1512377

URL: http://svn.apache.org/r1512377
Log:
* removed debugging from SearchManagerTest
* get rid of a few javadoc warnings

Modified:
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
    
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java?rev=1512377&r1=1512376&r2=1512377&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java 
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/LinkTag.java 
Fri Aug  9 16:20:27 2013
@@ -173,7 +173,7 @@ public class LinkTag
      *  This method figures out what kind of an URL should be output.  It 
mirrors heavily
      *  on JSPWikiMarkupParser.handleHyperlinks();
      *
-     * @return
+     * @return the URL
      * @throws ProviderException
      */
     private String figureOutURL()

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java?rev=1512377&r1=1512376&r2=1512377&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java 
(original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/PermissionTag.java 
Fri Aug  9 16:20:27 2013
@@ -103,7 +103,7 @@ public class PermissionTag
      *  Checks a single permission.
      *  
      *  @param permission
-     *  @return
+     *  @return true if granted, false if not
      */
     private boolean checkPermission( String permission )
     {

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java?rev=1512377&r1=1512376&r2=1512377&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java 
(original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java 
Fri Aug  9 16:20:27 2013
@@ -206,7 +206,7 @@ public class TemplateManager
      * @param sContext
      * @param template
      * @param name
-     * @return
+     * @return the Resource for the given template and name.
      */
     private static String findResource( ServletContext sContext, String 
template, String name )
     {

Modified: 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1512377&r1=1512376&r2=1512377&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
 Fri Aug  9 16:20:27 2013
@@ -70,13 +70,12 @@ public class SearchManagerTest extends T
         for( long l = 0; l < SLEEP_COUNT; l++ ) {
             if( res == null || res.isEmpty() ) {
                 Thread.sleep( SLEEP_TIME );
-                System.out.println( "SearchManagerTest.waitForIndex for " + 
testName + " sleeping " + l + " (out of " + SLEEP_COUNT + ")" );
             } else {
                 break;
             }
             res = m_mgr.findPages( text );
             
-            debugSearchResults( res );
+//            debugSearchResults( res );
         }
         return res;
     }