Author: vmassol
Date: 2008-02-04 19:32:39 +0100 (Mon, 04 Feb 2008)
New Revision: 84
Added:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Listener.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
Removed:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/StreamParser.java
components/xwiki-rendering/xwiki-rendering-api/src/main/resources/
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Document.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/AbstractFatherBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/Block.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/BoldBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ItalicBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LineBreakBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LinkBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/MacroBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ParagraphBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/SectionBlock.java
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/TextBlock.java
Log:
Renamed Rendered into Listener (to please Stephane ;) ... and because I agree)
and added the notion of Renderer which becomes a special Listener.
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Document.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Document.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Document.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,14 +1,21 @@
package org.xwiki.rendering;
-import org.xwiki.rendering.blocks.Block;
+import org.xwiki.rendering.blocks.AbstractFatherBlock;
-public class Document
+import java.util.List;
+
+public class Document extends AbstractFatherBlock
{
- private Block[] blocks;
+ public Document(List childBlocks)
+ {
+ super(childBlocks);
+ }
- public Block[] getBlocks()
+ public void before(Listener listener)
{
- return this.blocks;
}
+ public void after(Listener listener)
+ {
+ }
}
Copied:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Listener.java
(from rev 82,
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java)
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Listener.java
(rev 0)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Listener.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -0,0 +1,28 @@
+package org.xwiki.rendering;
+
+import java.util.Map;
+
+public interface Listener
+{
+ void beginBold();
+
+ void endBold();
+
+ void beginItalic();
+
+ void endItalic();
+
+ void onLineBreak();
+
+ void beginParagraph();
+
+ void endParagraph();
+
+ void onLink(String text);
+
+ void onMacro(String name, Map parameters, String content);
+
+ void onSection(SectionLevel level, String sectionTitle);
+
+ void onText(String text);
+}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -4,7 +4,6 @@
public interface Parser
{
- void parse(Reader source, Renderer renderer);
- void parse(Document documentBlock, Renderer renderer);
+ void parse(Reader source, Listener renderer);
Document parse(Reader source);
}
Deleted:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,28 +0,0 @@
-package org.xwiki.rendering;
-
-import java.util.Map;
-
-public interface Renderer
-{
- void beginBold();
-
- void endBold();
-
- void beginItalic();
-
- void endItalic();
-
- void onLineBreak();
-
- void beginParagraph();
-
- void endParagraph();
-
- void onLink(String text);
-
- void onMacro(String name, Map parameters, String content);
-
- void onSection(SectionLevel level, String sectionTitle);
-
- void onText(String text);
-}
Added:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
(rev 0)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -0,0 +1,8 @@
+package org.xwiki.rendering;
+
+/**
+ * A special type of Listener which writes data somewhere. For example, a
PDFRenderer, an XHTMLRenderer, etc.
+ */
+public interface Renderer extends Listener
+{
+}
Deleted:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/StreamParser.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/StreamParser.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/StreamParser.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,8 +0,0 @@
-package org.xwiki.rendering;
-
-import java.io.Reader;
-
-public interface StreamParser
-{
- void parse(Reader source, Renderer renderer);
-}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/AbstractFatherBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/AbstractFatherBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/AbstractFatherBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import java.util.Iterator;
import java.util.List;
@@ -10,9 +10,9 @@
{
private List blocks;
- public abstract void before( Renderer sink );
+ public abstract void before( Listener listener );
- public abstract void after( Renderer sink );
+ public abstract void after( Listener listener );
public AbstractFatherBlock( List childBlocks )
{
@@ -24,18 +24,18 @@
this.blocks = childBlocks;
}
- public void traverse( Renderer sink )
+ public void traverse( Listener listener )
{
- before( sink );
+ before( listener );
for ( Iterator i = blocks.iterator(); i.hasNext(); )
{
Block block = (Block) i.next();
- block.traverse( sink );
+ block.traverse( listener );
}
- after( sink );
+ after( listener );
}
public List getBlocks()
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/Block.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/Block.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/Block.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,8 +1,8 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
public interface Block
{
- void traverse( Renderer sink );
+ void traverse( Listener listener );
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/BoldBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/BoldBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/BoldBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import java.util.List;
@@ -12,13 +12,13 @@
super( childBlocks );
}
- public void before( Renderer renderer )
+ public void before( Listener listener )
{
- renderer.beginBold();
+ listener.beginBold();
}
- public void after( Renderer renderer )
+ public void after( Listener listener )
{
- renderer.endBold();
+ listener.endBold();
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ItalicBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ItalicBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ItalicBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import java.util.List;
@@ -12,13 +12,13 @@
super( childBlocks );
}
- public void before( Renderer renderer )
+ public void before( Listener listener )
{
- renderer.beginItalic();
+ listener.beginItalic();
}
- public void after( Renderer renderer )
+ public void after( Listener listener )
{
- renderer.endItalic();
+ listener.endItalic();
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LineBreakBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LineBreakBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LineBreakBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,12 +1,12 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
public class LineBreakBlock
implements Block
{
- public void traverse( Renderer renderer )
+ public void traverse( Listener listener )
{
- renderer.onLineBreak();
+ listener.onLineBreak();
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LinkBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LinkBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/LinkBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
public class LinkBlock
implements Block
@@ -22,8 +22,8 @@
return this.text;
}
- public void traverse( Renderer renderer )
+ public void traverse( Listener listener )
{
- renderer.onLink( getText() );
+ listener.onLink( getText() );
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/MacroBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/MacroBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/MacroBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import java.util.Map;
import java.util.HashMap;
@@ -21,7 +21,7 @@
this.content = content;
}
- public void traverse( Renderer renderer )
+ public void traverse( Listener listener )
{
// TODO
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ParagraphBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ParagraphBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/ParagraphBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import java.util.List;
@@ -13,13 +13,13 @@
super( blocks );
}
- public void before( Renderer renderer )
+ public void before( Listener listener )
{
- renderer.beginParagraph();
+ listener.beginParagraph();
}
- public void after( Renderer renderer )
+ public void after( Listener listener )
{
- renderer.endParagraph();
+ listener.endParagraph();
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/SectionBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/SectionBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/SectionBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
import org.xwiki.rendering.SectionLevel;
public class SectionBlock
@@ -26,9 +26,9 @@
return this.level;
}
- public void traverse( Renderer renderer )
+ public void traverse( Listener listener )
{
- renderer.onSection(getLevel(), getTitle());
+ listener.onSection(getLevel(), getTitle());
}
}
Modified:
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/TextBlock.java
===================================================================
---
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/TextBlock.java
2008-02-04 17:41:26 UTC (rev 83)
+++
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/blocks/TextBlock.java
2008-02-04 18:32:39 UTC (rev 84)
@@ -1,6 +1,6 @@
package org.xwiki.rendering.blocks;
-import org.xwiki.rendering.Renderer;
+import org.xwiki.rendering.Listener;
public class TextBlock
implements Block
@@ -12,9 +12,9 @@
this.text = text;
}
- public void traverse( Renderer renderer )
+ public void traverse( Listener listener )
{
- renderer.onText( getText() );
+ listener.onText( getText() );
}
public String getText()
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
