[xwiki-notifications] r10963 - in xwiki-platform/core/trunk/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/block xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer xwiki-rendering-tests/src/test/java/org/xwiki/rendering/scaffolding

[vmassol (SVN)]

Author: vmassol
Date: 2008-07-01 11:26:18 +0200 (Tue, 01 Jul 2008)
New Revision: 10963

Modified:
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XHTMLRenderer.java
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java
   xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/scaffolding/TestEventsListener.java
Log:
XWIKI-2508: Firm up the new rendering module implementation

* Added 2 new events: beginDocument and endDocument. These are required for listener/renderer which need to output a prolog.

Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java	2008-07-01 09:24:09 UTC (rev 10962)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/block/XDOM.java	2008-07-01 09:26:18 UTC (rev 10963)
@@ -46,6 +46,7 @@
      */
     public void before(Listener listener)
     {
+    	listener.beginDocument();
     }
 
     /**
@@ -54,5 +55,6 @@
      */
     public void after(Listener listener)
     {
+    	listener.endDocument();
     }
 }

Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java	2008-07-01 09:24:09 UTC (rev 10962)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/listener/Listener.java	2008-07-01 09:26:18 UTC (rev 10963)
@@ -27,6 +27,16 @@
  */
 public interface Listener
 {
+	/**
+	 * First event generated representing the start of the document.
+	 */
+	void beginDocument();
+
+	/**
+	 * Last event generated representing the end of the document.
+	 */
+	void endDocument();
+	
     void beginBold();
 
     void endBold();

Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XHTMLRenderer.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XHTMLRenderer.java	2008-07-01 09:24:09 UTC (rev 10962)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XHTMLRenderer.java	2008-07-01 09:26:18 UTC (rev 10963)
@@ -50,8 +50,18 @@
         this.linkRenderer = new XHTMLLinkRenderer(documentManager);
     }
 
-    public void beginBold()
+    public void beginDocument()
     {
+    	// Don't do anything
+	}
+
+	public void endDocument()
+	{
+    	// Don't do anything
+	}
+
+	public void beginBold()
+    {
         write("<strong>");
     }
 

Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java	2008-07-01 09:24:09 UTC (rev 10962)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/renderer/XWikiSyntaxRenderer.java	2008-07-01 09:26:18 UTC (rev 10963)
@@ -52,6 +52,16 @@
         this.writer = new PrintWriter(writer);
     }
 
+    public void beginDocument()
+    {
+    	// Don't do anything
+	}
+
+	public void endDocument()
+	{
+    	// Don't do anything
+	}
+    
     public void onLink(Link link)
     {
         write("[");

Modified: xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/scaffolding/TestEventsListener.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/scaffolding/TestEventsListener.java	2008-07-01 09:24:09 UTC (rev 10962)
+++ xwiki-platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/java/org/xwiki/rendering/scaffolding/TestEventsListener.java	2008-07-01 09:26:18 UTC (rev 10963)
@@ -38,8 +38,18 @@
         this.writer = new PrintWriter(writer);
     }
 
-    public void beginBold()
+    public void beginDocument()
     {
+    	write("beginDocument");
+	}
+
+	public void endDocument()
+	{
+		write("endDocument");
+	}
+
+	public void beginBold()
+    {
         write("beginBold");
     }