You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/26 23:13:24 UTC
svn commit: r126546 - /maven/maven-1/plugins/trunk/jxr/project.xml /maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java /maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
Author: brett
Date: Wed Jan 26 14:13:22 2005
New Revision: 126546
URL: http://svn.apache.org/viewcvs?view=rev&rev=126546
Log:
PR: MPJXR-11
Fix handling of package and import
Also correct version - 1.4.3 has not been released
Modified:
maven/maven-1/plugins/trunk/jxr/project.xml
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jxr/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/project.xml?view=diff&rev=126546&p1=maven/maven-1/plugins/trunk/jxr/project.xml&r1=126545&p2=maven/maven-1/plugins/trunk/jxr/project.xml&r2=126546
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/project.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/project.xml Wed Jan 26 14:13:22 2005
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-jxr-plugin</id>
<name>Maven JXR Plug-in</name>
- <currentVersion>1.4.3</currentVersion>
+ <currentVersion>1.4.3-SNAPSHOT</currentVersion>
<description>Create cross reference.</description>
<shortDescription>Create cross reference</shortDescription>
<url>http://maven.apache.org/reference/plugins/jxr/</url>
Modified: maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java?view=diff&rev=126546&p1=maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java&r1=126545&p2=maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java&r2=126546
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java (original)
+++ maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/CodeTransform.java Wed Jan 26 14:13:22 2005
@@ -1100,9 +1100,10 @@
- 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(" ");
Modified: maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml?view=diff&rev=126546&p1=maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml&r1=126545&p2=maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml&r2=126546
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml Wed Jan 26 14:13:22 2005
@@ -25,7 +25,8 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<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>
</release>
<release version="1.4.2" date="2004-10-23">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org