Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPJXR-11

Browse Source 
Fix handling of package and import
Also correct version - 1.4.3 has not been released



git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@126546 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2005-01-26 22:13:22 +00:00
parent e5fbc3d61a
commit dfb9c74316
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jxr/project.xml
View File

@ -23,7 +23,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-jxr-plugin</id> <id>maven-jxr-plugin</id>
<name>Maven JXR Plug-in</name> <name>Maven JXR Plug-in</name>
<currentVersion>1.4.3</currentVersion> <currentVersion>1.4.3-SNAPSHOT</currentVersion>
<description>Create cross reference.</description> <description>Create cross reference.</description>
<shortDescription>Create cross reference</shortDescription> <shortDescription>Create cross reference</shortDescription>
<url>http://maven.apache.org/reference/plugins/jxr/</url> <url>http://maven.apache.org/reference/plugins/jxr/</url>

5
jxr/src/main/org/apache/maven/jxr/CodeTransform.java
View File

@ -1100,9 +1100,10 @@ public class CodeTransform implements Serializable
- that it WILL be on the disk since this is based on the current - that it WILL be on the disk since this is based on the current
- file. - 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(" "); start = line.trim().indexOf(" ");

3
jxr/xdocs/changes.xml
View File

@ -25,7 +25,8 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author> <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties> </properties>
<body> <body>
<release version="1.4.3" date="In CVS"> <release version="1.4.3-SNAPSHOT" date="in SVN">
<action dev="brett" type="fix" issue="MPJXR-11" due-to="Lukas Theussi">Fix malformed HTML when "package" or "import" used in the code/comments outside of the normal keyword use</action>
<action dev="evenisse" type="fix" issue="MPJXR-18">Remove hardcoded encoding in templates.</action> <action dev="evenisse" type="fix" issue="MPJXR-18">Remove hardcoded encoding in templates.</action>
</release> </release>
<release version="1.4.2" date="2004-10-23"> <release version="1.4.2" date="2004-10-23">