svn commit: r708532 - in /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia: parser/XhtmlBaseParser.java sink/SinkUtils.java

[vsiveton]

Author: vsiveton
Date: Tue Oct 28 04:35:13 2008
New Revision: 708532

URL: http://svn.apache.org/viewvc?rev=708532&view=rev
Log:
o access directly to the SinkEventAttributes fields

Modified:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=708532&r1=708531&r2=708532&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
 Tue Oct 28 04:35:13 2008
@@ -25,6 +25,7 @@
 import org.apache.maven.doxia.macro.MacroExecutionException;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.util.DoxiaUtils;
 
 import org.codehaus.plexus.util.StringUtils;
@@ -173,7 +174,7 @@
             {
                 this.inFigure = true;
                 SinkEventAttributeSet atts = new SinkEventAttributeSet( 
attribs );
-                atts.removeAttribute( SinkEventAttributeSet.CLASS );
+                atts.removeAttribute( SinkEventAttributes.CLASS );
                 sink.figure( atts );
             }
             else
@@ -195,7 +196,7 @@
         {
             verbatim();
 
-            attribs.removeAttribute( SinkEventAttributeSet.DECORATION );
+            attribs.removeAttribute( SinkEventAttributes.DECORATION );
 
             sink.verbatim( attribs );
         }
@@ -646,11 +647,11 @@
             {
                 if ( "underline".equals( decoration ) || 
"line-through".equals( decoration ) )
                 {
-                    atts.addAttribute( SinkEventAttributeSet.DECORATION, 
decoration);
+                    atts.addAttribute( SinkEventAttributes.DECORATION, 
decoration);
                 }
                 else if ( "sub".equals( decoration ) || "sup".equals( 
decoration ) )
                 {
-                    atts.addAttribute( SinkEventAttributeSet.VALIGN, 
decoration);
+                    atts.addAttribute( SinkEventAttributes.VALIGN, decoration);
                 }
             }
 

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java?rev=708532&r1=708531&r2=708532&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
 Tue Oct 28 04:35:13 2008
@@ -197,7 +197,7 @@
             if ( value instanceof AttributeSet )
             {
                 // Other AttributeSets are ignored
-                if ( SinkEventAttributeSet.STYLE.equals( key.toString() ) )
+                if ( SinkEventAttributes.STYLE.equals( key.toString() ) )
                 {
                     sb.append( Markup.SPACE ).append( key.toString() ).append( 
Markup.EQUAL )
                         .append( Markup.QUOTE ).append( asCssString( 
(AttributeSet) value ) )