You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2014/05/12 21:27:12 UTC
[1/2] git commit: fix some illegal markup (closing tags with
attributes)
Repository: tapestry-5
Updated Branches:
refs/heads/master 3d0060691 -> 85a71aeda
fix some illegal markup (closing tags with attributes)
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1363f915
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1363f915
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1363f915
Branch: refs/heads/master
Commit: 1363f915d51209fc6e418a643100f069f7b4aa86
Parents: 3d00606
Author: Jochen Kemnade <jk...@apache.org>
Authored: Mon May 12 21:24:32 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Mon May 12 21:24:32 2014 +0200
----------------------------------------------------------------------
.../org/apache/tapestry5/javadoc/TapestryDocTaglet.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1363f915/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
index 5fa308b..4f19aaf 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/TapestryDocTaglet.java
@@ -147,10 +147,16 @@ public class TapestryDocTaglet implements Taglet, ClassDescriptionSource
}
}
- private void writeElement(Writer writer, String elementName, String text) throws IOException
+ private void writeElement(Writer writer, String elementSpec, String text) throws IOException
{
- writer.write(String.format("<%s>%s</%1$s>", elementName,
- InternalUtils.isBlank(text) ? " " : text));
+ String elementName = elementSpec;
+ int idxOfSpace = elementSpec.indexOf(' ');
+ if (idxOfSpace != -1)
+ {
+ elementName = elementSpec.substring(0, idxOfSpace);
+ }
+ writer.write(String.format("<%s>%s</%s>", elementSpec,
+ InternalUtils.isBlank(text) ? " " : text, elementName));
}
private void writeClassDescription(ClassDescription cd, Writer writer) throws IOException
[2/2] git commit: TAP5-2266: escape html content in @code tags
instead of removing it
Posted by jk...@apache.org.
TAP5-2266: escape html content in @code tags instead of removing it
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/85a71aed
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/85a71aed
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/85a71aed
Branch: refs/heads/master
Commit: 85a71aeda85a8abbc8993c8771d60b1ef3d00000
Parents: 1363f91
Author: Jochen Kemnade <jk...@apache.org>
Authored: Mon May 12 21:25:18 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Mon May 12 21:25:18 2014 +0200
----------------------------------------------------------------------
tapestry-javadoc/build.gradle | 1 +
.../org/apache/tapestry5/javadoc/ParameterDescription.java | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85a71aed/tapestry-javadoc/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/build.gradle b/tapestry-javadoc/build.gradle
index 278f209..032114a 100644
--- a/tapestry-javadoc/build.gradle
+++ b/tapestry-javadoc/build.gradle
@@ -2,6 +2,7 @@ description = "JavaDoc Plugin for Tapestry that generates component reference do
dependencies {
compile project(':tapestry-core')
+ compile "commons-lang:commons-lang:2.6"
compile files(getTools())
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85a71aed/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
index 80aa2ae..a60f8a7 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
@@ -21,6 +21,8 @@ import com.sun.javadoc.Tag;
import java.io.IOException;
import java.util.regex.Pattern;
+import org.apache.commons.lang.StringEscapeUtils;
+
public class ParameterDescription
{
public final FieldDoc field;
@@ -98,6 +100,12 @@ public class ParameterDescription
builder.append(seeTag.referencedMemberName());
}
}
+ else if (tag.name().equals("@code"))
+ {
+ builder.append("<code>");
+ builder.append(StringEscapeUtils.escapeHtml(tag.text()));
+ builder.append("</code>");
+ }
}
String text = builder.toString();
[2/2] git commit: TAP5-2266: escape html content in @code tags
instead of removing it
Posted by jk...@apache.org.
TAP5-2266: escape html content in @code tags instead of removing it
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/85a71aed
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/85a71aed
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/85a71aed
Branch: refs/heads/master
Commit: 85a71aeda85a8abbc8993c8771d60b1ef3d00000
Parents: 1363f91
Author: Jochen Kemnade <jk...@apache.org>
Authored: Mon May 12 21:25:18 2014 +0200
Committer: Jochen Kemnade <jk...@apache.org>
Committed: Mon May 12 21:25:18 2014 +0200
----------------------------------------------------------------------
tapestry-javadoc/build.gradle | 1 +
.../org/apache/tapestry5/javadoc/ParameterDescription.java | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85a71aed/tapestry-javadoc/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/build.gradle b/tapestry-javadoc/build.gradle
index 278f209..032114a 100644
--- a/tapestry-javadoc/build.gradle
+++ b/tapestry-javadoc/build.gradle
@@ -2,6 +2,7 @@ description = "JavaDoc Plugin for Tapestry that generates component reference do
dependencies {
compile project(':tapestry-core')
+ compile "commons-lang:commons-lang:2.6"
compile files(getTools())
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/85a71aed/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
----------------------------------------------------------------------
diff --git a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
index 80aa2ae..a60f8a7 100644
--- a/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
+++ b/tapestry-javadoc/src/main/java/org/apache/tapestry5/javadoc/ParameterDescription.java
@@ -21,6 +21,8 @@ import com.sun.javadoc.Tag;
import java.io.IOException;
import java.util.regex.Pattern;
+import org.apache.commons.lang.StringEscapeUtils;
+
public class ParameterDescription
{
public final FieldDoc field;
@@ -98,6 +100,12 @@ public class ParameterDescription
builder.append(seeTag.referencedMemberName());
}
}
+ else if (tag.name().equals("@code"))
+ {
+ builder.append("<code>");
+ builder.append(StringEscapeUtils.escapeHtml(tag.text()));
+ builder.append("</code>");
+ }
}
String text = builder.toString();