diff --git a/jxr/project.xml b/jxr/project.xml index 7b1cc7cd..0fa4c13a 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -23,7 +23,7 @@ 3 maven-jxr-plugin Maven JXR Plug-in - 1.4.3 + 1.4.3-SNAPSHOT Create cross reference. Create cross reference http://maven.apache.org/reference/plugins/jxr/ diff --git a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java index f8d98a74..8b17708f 100644 --- a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java +++ b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java @@ -1100,9 +1100,10 @@ public class CodeTransform implements Serializable - that it WILL be on the disk since this is based on the current - file. */ - boolean isPackage = line.indexOf("package") != -1; + boolean isPackage = line.trim().startsWith("package "); + boolean isImport = line.trim().startsWith("import "); - if (line.indexOf("import") != -1 || isPackage) + if (isImport || isPackage) { start = line.trim().indexOf(" "); diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index bb13da25..e34093c4 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -25,7 +25,8 @@ Emmanuel Venisse - + + Fix malformed HTML when "package" or "import" used in the code/comments outside of the normal keyword use Remove hardcoded encoding in templates.