svn commit: r772878 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/macro/toc/TocMacro.java test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java

[ltheussl]

Author: ltheussl
Date: Fri May  8 08:08:03 2009
New Revision: 772878

URL: http://svn.apache.org/viewvc?rev=772878&view=rev
Log:
[DOXIA-316] revert r772599 to fix test failures in apt module.

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
    
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java?rev=772878&r1=772877&r2=772878&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
 Fri May  8 08:08:03 2009
@@ -129,7 +129,7 @@
 
         if ( index.getChildEntries().size() > 0 )
         {
-            if ( ( fromDepth < section ) || ( section == 0 ) )
+            if ( ( fromDepth <= toDepth ) || ( section == 0 ) )
             {
                 sink.list();
             }
@@ -141,12 +141,12 @@
                 IndexEntry sectionIndex = (IndexEntry) it.next();
                 if ( ( i == section ) || ( section == 0 ) )
                 {
-                    writeSubSectionN( sink, sectionIndex, 0 );
+                    writeSubSectionN( sink, sectionIndex, 1 );
                 }
                 i++;
             }
 
-            if ( ( fromDepth < section ) || ( section == 0 ) )
+            if ( ( fromDepth <= toDepth ) || ( section == 0 ) )
             {
                 sink.list_();
             }

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java?rev=772878&r1=772877&r2=772878&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
 Fri May  8 08:08:03 2009
@@ -107,8 +107,8 @@
         parser.setSecondParsing( true );
         macroParameters.put( "parser", parser );
         macroParameters.put( "section", "2" );
-        macroParameters.put( "fromDepth", "0" );
-        macroParameters.put( "toDepth", "1" );
+        macroParameters.put( "fromDepth", "1" );
+        macroParameters.put( "toDepth", "2" );
 
         sink.reset();
         request = new MacroRequest( macroParameters, basedir );