maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r519791 - in /maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src: main/java/org/apache/maven/doxia/module/xhtml/ main/java/org/apache/maven/doxia/module/xhtml/decoration/render/ test/java/org/apache/maven/doxia/module/xhtml/
Date Mon, 19 Mar 2007 02:01:24 GMT
Author: jvanzyl
Date: Sun Mar 18 19:01:22 2007
New Revision: 519791

URL: http://svn.apache.org/viewvc?view=rev&rev=519791
Log:
o put the rendering context back where it was, it's leaked out all over the place and breaks
everything

Added:
    maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
  (contents, props changed)
      - copied, changed from r519682, maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/RenderingContext.java
Removed:
    maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/RenderingContext.java
    maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
Modified:
    maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
    maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java

Modified: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?view=diff&rev=519791&r1=519790&r2=519791
==============================================================================
--- maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
(original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Sun Mar 18 19:01:22 2007
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.Map;
-
-import org.apache.maven.doxia.util.HtmlTools;
-import org.apache.maven.doxia.module.xhtml.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.StructureSink;
+import org.apache.maven.doxia.util.HtmlTools;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Map;
+
 /**
  * A doxia sink which produces xhtml
  *
@@ -52,7 +52,7 @@
 
     private PrintWriter writer;
 
-    private StringsMap directives;
+    //private StringsMap directives;
 
     private RenderingContext renderingContext;
 
@@ -62,8 +62,6 @@
     {
         this.writer = new PrintWriter( writer );
 
-        this.directives = new StringsMap( directives );
-
         this.renderingContext = renderingContext;
     }
 
@@ -93,7 +91,8 @@
 
     public void head()
     {
-        directive( "head()" );
+        // Not used overridden in site renderer
+        // directive( "head()" );
 
         resetState();
 
@@ -104,7 +103,8 @@
     {
         headFlag = false;
 
-        directive( "head_()" );
+        // Not used overridden in site renderer
+        //directive( "head_()" );
     }
 
     public void title()
@@ -145,18 +145,17 @@
 
     public void body()
     {
-        String body = directiveValue( "body()" );
-
-        write( body );
+        // Not used overridden in site renderer
+        //String body = directiveValue( "body()" );
+        //write( body );
     }
 
     public void body_()
     {
-        String body = directiveValue( "body_()" );
-
-        write( body );
-
-        resetState();
+        // Not used overridden in site renderer
+        //String body = directiveValue( "body_()" );
+        //write( body );
+        //resetState();
     }
 
     // ----------------------------------------------------------------------
@@ -802,16 +801,6 @@
         }
 
         writer.write( text );
-    }
-
-    protected String directiveValue( String key )
-    {
-        return directives.get( key );
-    }
-
-    protected void directive( String key )
-    {
-        write( directives.get( key ) );
     }
 
     protected void content( String text )

Copied: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
(from r519682, maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/RenderingContext.java)
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java?view=diff&rev=519791&p1=maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/RenderingContext.java&r1=519682&p2=maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java&r2=519791
==============================================================================
--- maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/RenderingContext.java
(original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
Sun Mar 18 19:01:22 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.doxia.module.xhtml;
+package org.apache.maven.doxia.module.xhtml.decoration.render;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Propchange: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?view=diff&rev=519791&r1=519790&r2=519791
==============================================================================
--- maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++ maven/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Sun Mar 18 19:01:22 2007
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.module.xhtml.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.sink.AbstractSinkTestCase;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.parser.Parser;



Mime
View raw message