maven-doxia-commits mailing list archives

Author: vsiveton
Date: Fri Feb 15 16:09:35 2008
New Revision: 628207

URL: http://svn.apache.org/viewvc?rev=628207&view=rev
Log:
DOXIA-56: clean up doxia api and code

o fixed renamed due to r628206

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?rev=628207&r1=628206&r2=628207&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Fri Feb 15 16:09:35 2008
@@ -30,8 +30,8 @@
 
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.AbstractXmlSink;
-import org.apache.maven.doxia.sink.StructureSink;
 import org.apache.maven.doxia.util.LineBreaker;
+import org.apache.maven.doxia.util.StructureSinkUtils;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -1453,7 +1453,7 @@
         {
             // First char of ID cannot be a digit.
             MutableAttributeSet att = new SimpleAttributeSet();
-            att.addAttribute( Attribute.ID, "a." + StructureSink.linkToKey( name ) );
+            att.addAttribute( Attribute.ID, "a." + StructureSinkUtils.linkToKey( name ) );
 
             // TODO: why?
             if ( xmlMode )
@@ -1493,7 +1493,7 @@
      */
     public void link( String name )
     {
-        if ( StructureSink.isExternalLink( name ) )
+        if ( StructureSinkUtils.isExternalLink( name ) )
         {
             externalLinkFlag = true;
             MutableAttributeSet att = new SimpleAttributeSet();
@@ -1505,7 +1505,7 @@
         {
             // First char of ID cannot be a digit.
             MutableAttributeSet att = new SimpleAttributeSet();
-            att.addAttribute( LINKEND_ATTRIBUTE, "a." + StructureSink.linkToKey( name ) );
+            att.addAttribute( LINKEND_ATTRIBUTE, "a." + StructureSinkUtils.linkToKey( name
) );
 
             writeStartTag( LINK_TAG, att );
         }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=628207&r1=628206&r2=628207&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Fri Feb 15 16:09:35 2008
@@ -26,9 +26,9 @@
 import javax.swing.text.html.HTML.Attribute;
 import javax.swing.text.html.HTML.Tag;
 
-import org.apache.maven.doxia.sink.StructureSink;
 import org.apache.maven.doxia.sink.XhtmlBaseSink;
 import org.apache.maven.doxia.util.HtmlTools;
+import org.apache.maven.doxia.util.StructureSinkUtils;
 
 /**
  * A doxia Sink which produces an xdoc model.
@@ -378,7 +378,7 @@
             att.addAttribute( Attribute.TARGET, target );
         }
 
-        if ( StructureSink.isExternalLink( name ) || isExternalHtml( name ) )
+        if ( StructureSinkUtils.isExternalLink( name ) || isExternalHtml( name ) )
         {
             att.addAttribute( Attribute.HREF, HtmlTools.escapeHTML( name ) );
         }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java?rev=628207&r1=628206&r2=628207&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
(original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
Fri Feb 15 16:09:35 2008
@@ -21,8 +21,8 @@
 
 import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.SinkAdapter;
-import org.apache.maven.doxia.sink.StructureSink;
 import org.apache.maven.doxia.util.HtmlTools;
+import org.apache.maven.doxia.util.StructureSinkUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XMLWriter;
 
@@ -528,7 +528,7 @@
     {
         if ( !headFlag )
         {
-            String id = StructureSink.linkToKey( name );
+            String id = StructureSinkUtils.linkToKey( name );
             writer.startElement( "a" );
             writer.addAttribute( "id", id );
             writer.addAttribute( "name", id );