[xwiki-notifications] r82 - components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering

[SVN]

Author: vmassol
Date: 2008-02-04 18:41:02 +0100 (Mon, 04 Feb 2008)
New Revision: 82

Added:
   
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
Removed:
   
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DOMParser.java
   
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DefaultDOMParser.java
   
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DocumentDOM.java
   
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/
Modified:
   
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
Log:
Cleanup and introduce Blocks

Deleted: 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DOMParser.java
===================================================================
--- 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DOMParser.java
     2008-02-04 17:00:02 UTC (rev 81)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DOMParser.java
     2008-02-04 17:41:02 UTC (rev 82)
@@ -1,9 +0,0 @@
-package org.xwiki.rendering;
-
-import java.io.Reader;
-
-public interface DOMParser
-{
-    DocumentDOM parse(Reader source);
-    DocumentDOM parse(StreamParser streamParser);
-}

Deleted: 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DefaultDOMParser.java
===================================================================
--- 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DefaultDOMParser.java
      2008-02-04 17:00:02 UTC (rev 81)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DefaultDOMParser.java
      2008-02-04 17:41:02 UTC (rev 82)
@@ -1,19 +0,0 @@
-package org.xwiki.rendering;
-
-import java.io.Reader;
-
-public class DefaultDOMParser implements DOMParser
-{
-    // TODO: Use a cache to cache the DocumentDOM objects and check if one 
exists before
-    // parsing.
-
-    public DocumentDOM parse(Reader source)
-    {
-        return null;  //To change body of implemented methods use File | 
Settings | File Templates.
-    }
-
-    public DocumentDOM parse(StreamParser streamParser)
-    {
-        return null;  //To change body of implemented methods use File | 
Settings | File Templates.
-    }
-}

Added: 
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
                              (rev 0)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Document.java
      2008-02-04 17:41:02 UTC (rev 82)
@@ -0,0 +1,14 @@
+package org.xwiki.rendering;
+
+import org.xwiki.rendering.blocks.Block;
+
+public class Document
+{
+    private Block[] blocks;
+
+    public Block[] getBlocks()
+    {
+        return this.blocks;
+    }
+
+}

Deleted: 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DocumentDOM.java
===================================================================
--- 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DocumentDOM.java
   2008-02-04 17:00:02 UTC (rev 81)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/DocumentDOM.java
   2008-02-04 17:41:02 UTC (rev 82)
@@ -1,5 +0,0 @@
-package org.xwiki.rendering;
-
-public class DocumentDOM
-{
-}

Copied: 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
 (from rev 80, 
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/Parser.java
                                (rev 0)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Parser.java
        2008-02-04 17:41:02 UTC (rev 82)
@@ -0,0 +1,10 @@
+package org.xwiki.rendering;
+
+import java.io.Reader;
+
+public interface Parser
+{
+    void parse(Reader source, Renderer renderer);
+    void parse(Document documentBlock, Renderer renderer);
+    Document parse(Reader source);
+}

Modified: 
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:00:02 UTC (rev 81)
+++ 
components/xwiki-rendering/xwiki-rendering-api/src/main/java/org/xwiki/rendering/Renderer.java
      2008-02-04 17:41:02 UTC (rev 82)
@@ -1,6 +1,28 @@
 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);
 }

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications