Author: jvanzyl
Date: Sun Nov 27 07:06:23 2005
New Revision: 349243
URL: http://svn.apache.org/viewcvs?rev=349243&view=rev
Log:
o links with no text, just the reference.
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java?rev=349243&r1=349242&r2=349243&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/LinkBlock.java
Sun Nov 27 07:06:23 2005
@@ -27,7 +27,9 @@
public final void traverse( final Sink sink )
{
sink.link( reference );
+
sink.text( text );
+
sink.link_();
}
}
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java?rev=349243&r1=349242&r2=349243&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/ParagraphBlockParser.java
Sun Nov 27 07:06:23 2005
@@ -82,8 +82,18 @@
case ']':
if ( insideLink )
{
- String[] pieces = StringUtils.split(
text.toString(), "|" );
- blocks.add( new LinkBlock( pieces[1], pieces[0] )
);
+ String link = text.toString();
+
+ if ( link.indexOf( "|" ) > 0 )
+ {
+ String[] pieces = StringUtils.split(
text.toString(), "|" );
+ blocks.add( new LinkBlock( pieces[1],
pieces[0] ) );
+ }
+ else
+ {
+ blocks.add( new LinkBlock( link, link ) );
+ }
+
text = new StringBuffer();
}
Modified: maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence?rev=349243&r1=349242&r2=349243&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence
(original)
+++ maven/doxia/trunk/doxia-core/src/test/site/confluence/page.confluence Sun
Nov 27 07:06:23 2005
@@ -6,6 +6,8 @@
Here is a link to [JIRA|http://jira.codehaus.org]
+Here is a link with no text [http://jira.codehaus.org]
+
This is some {{monospaced}} text.
h1. I am h1
