You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/10/01 18:18:41 UTC
[maven-doxia] 01/01: [DOXIA-670] Drop dead XdocSink#link(String, String) method
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIA-670
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 614dc82afe331edf955676a736f0395a86015719
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 1 20:17:32 2022 +0200
[DOXIA-670] Drop dead XdocSink#link(String, String) method
This closes #116
---
.../apache/maven/doxia/module/xdoc/XdocSink.java | 25 ----------------------
.../maven/doxia/module/xdoc/XdocSinkTest.java | 11 +++++++---
2 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
index b4804b94..cc4a3089 100644
--- a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
+++ b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
@@ -504,31 +504,6 @@ public class XdocSink
init();
}
- /**
- * Adds a link with an optional target.
- *
- * @param name the link name.
- * @param target the link target, may be null.
- */
- public void link( String name, String target )
- {
- if ( isHeadFlag() )
- {
- return;
- }
-
- MutableAttributeSet att = new SinkEventAttributeSet();
-
- att.addAttribute( Attribute.HREF, HtmlTools.escapeHTML( name ) );
-
- if ( target != null )
- {
- att.addAttribute( Attribute.TARGET, target );
- }
-
- writeStartTag( A, att );
- }
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
diff --git a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
index 3e8613f8..64bb5699 100644
--- a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
+++ b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.doxia.module.xdoc;
*/
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.AbstractSinkTest;
import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.junit.jupiter.api.Test;
@@ -27,6 +28,8 @@ import org.junit.jupiter.api.Test;
import java.io.StringWriter;
import java.io.Writer;
+import javax.swing.text.html.HTML.Attribute;
+
import static org.apache.maven.doxia.util.HtmlTools.escapeHTML;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -416,9 +419,11 @@ public class XdocSinkTest
{
sink = new XdocSink( writer );
- sink.link( "name", (String) null );
+ sink.link( "name" );
sink.link_();
- sink.link( "name", "nirvana" );
+ SinkEventAttributes attrs = new SinkEventAttributeSet();
+ attrs.addAttribute( Attribute.TARGET, "nirvana" );
+ sink.link( "name", attrs );
sink.link_();
}
finally
@@ -426,7 +431,7 @@ public class XdocSinkTest
sink.close();
}
- assertEquals( "<a href=\"name\"></a><a href=\"name\" target=\"nirvana\"></a>", writer.toString() );
+ assertEquals( "<a href=\"name\"></a><a target=\"nirvana\" href=\"name\"></a>", writer.toString() );
}
/** {@inheritDoc} */