r1312 - xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter

[Jeremi Joslin]

Author: jeremi
Date: 2006-09-13 07:42:38 +0200 (Wed, 13 Sep 2006)
New Revision: 1312

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
Log:
fix the id header generation

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-09-12 21:05:31 UTC (rev 1311)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-09-13 05:42:38 UTC (rev 1312)
@@ -89,18 +89,13 @@
 			processedHeadings = new ArrayList();
 			rcontext.set("processedHeadings", processedHeadings);
 		}
-		boolean isIdOk = false;
 		id = TOCGenerator.makeHeadingID(text, 0, xcontext);
-		while(!isIdOk){
-			int occurence = 0;
-			for (Iterator iter = processedHeadings.iterator(); iter.hasNext();){
-				if (iter.next().equals(id)) occurence++;
-			}
-			id = TOCGenerator.makeHeadingID(text, occurence, xcontext);
-			if(occurence == 0){
-				isIdOk = true;
-			}
-		}
+        int occurence = 0;
+        for (Iterator iter = processedHeadings.iterator(); iter.hasNext();){
+            if (iter.next().equals(id)) occurence++;
+        }
+        if (occurence != 0)
+            id = TOCGenerator.makeHeadingID(text, occurence, xcontext);
 		processedHeadings.add(id);
 
 		//  add numbering if the flag is set