diff --git a/jxr/project.xml b/jxr/project.xml index 4b905be0..361778dd 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -5,7 +5,7 @@ 3 maven-jxr-plugin Maven JXR Plug-in - 1.0 + 1.1-SNAPSHOT diff --git a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java index 566983dc..a3f5434b 100644 --- a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java +++ b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java @@ -169,12 +169,20 @@ public class CodeTransform implements Serializable */ private String javadocLinkDir; + /* + * Package Manager for this project. + */ + private PackageManager packageManager; + /** * Constructor for the CodeTransform object + * + * @param packageManager PackageManager for this project */ - public CodeTransform() + public CodeTransform(PackageManager packageManager) { + this.packageManager = packageManager; loadHash(); } @@ -750,7 +758,7 @@ public class CodeTransform implements Serializable //get the package from teh PackageManager because this will hold //the version with the classes also. - PackageType currentImport = PackageManager.getInstance() + PackageType currentImport = packageManager .getPackageType(packages[j]); //the package here might in fact be null because it wasn't parsed out @@ -791,7 +799,7 @@ public class CodeTransform implements Serializable //it doesn't have to be explicitly imported so this information //is useless. Instead just see if it was parsed out. - PackageType pt = PackageManager.getInstance().getPackageType(fqpn_package); + PackageType pt = packageManager.getPackageType(fqpn_package); if (pt != null) { @@ -1012,7 +1020,7 @@ public class CodeTransform implements Serializable String pkgHREF = getHREF(pkg); //if this package is within the PackageManager then you can create an HREF for it. - if (PackageManager.getInstance().getPackageType(pkg) != null || + if (packageManager.getPackageType(pkg) != null || isPackage) { diff --git a/jxr/src/main/org/apache/maven/jxr/JXR.java b/jxr/src/main/org/apache/maven/jxr/JXR.java index 3c7ad7d1..2095b3be 100644 --- a/jxr/src/main/org/apache/maven/jxr/JXR.java +++ b/jxr/src/main/org/apache/maven/jxr/JXR.java @@ -57,13 +57,14 @@ package org.apache.maven.jxr; import java.io.File; import java.io.IOException; +import org.apache.maven.jxr.pacman.PackageManager; import org.apache.tools.ant.DirectoryScanner; /** * Main entry point into Maven used to kick off the XReference code building. * * @author Kevin A. Burton - * @version $Id: JXR.java,v 1.1 2003/01/24 03:45:41 jvanzyl Exp $ + * @version $Id: JXR.java,v 1.2 2003/01/25 10:04:24 evenisse Exp $ */ public class JXR { @@ -93,7 +94,7 @@ public class JXR * Handles taking .java files and changing them into html. "More than meets * the eye!" :) */ - private CodeTransform transformer = new CodeTransform(); + private CodeTransform transformer; /** * The revision of the module currently being processed. @@ -103,16 +104,19 @@ public class JXR /** * The constructor for the JXR class. * + * @param packageManager The Package Manager for this project * @param revision The CVS revision of this file. * @param source The directory that files are being read from (src/java) * @param source * @param dest */ - public JXR(String source, + public JXR(PackageManager packageManager, + String source, String dest, String javadocLinkDir, String revision) { + this.transformer = new CodeTransform(packageManager); this.source = source; this.dest = dest; this.javadocLinkDir = javadocLinkDir; diff --git a/jxr/src/main/org/apache/maven/jxr/JxrBean.java b/jxr/src/main/org/apache/maven/jxr/JxrBean.java index a1a49267..2da3c924 100644 --- a/jxr/src/main/org/apache/maven/jxr/JxrBean.java +++ b/jxr/src/main/org/apache/maven/jxr/JxrBean.java @@ -58,8 +58,6 @@ package org.apache.maven.jxr; import org.apache.maven.jxr.JXR; import org.apache.maven.jxr.DirectoryIndexer; -import org.apache.maven.jxr.pacman.PackageManager; - import org.apache.maven.jxr.pacman.PackageManager; import org.apache.maven.jxr.pacman.PackageType; import org.apache.maven.jxr.pacman.ClassType; @@ -82,7 +80,7 @@ import org.apache.commons.logging.LogFactory; * @author Josh Lucas * @author Jason van Zyl * @author Brian Leonard - * @version $Id: JxrBean.java,v 1.1 2003/01/24 03:45:41 jvanzyl Exp $ + * @version $Id: JxrBean.java,v 1.2 2003/01/25 10:04:24 evenisse Exp $ */ public class JxrBean { @@ -124,7 +122,7 @@ public class JxrBean javadocLinkDir = getRelativeLink(destDir, javadocDir); // first collect package and class info - PackageManager pkgmgr = PackageManager.getInstance(); + PackageManager pkgmgr = new PackageManager(); // go through each source directory and xref the java files for (Iterator i = sourceDirs.iterator(); i.hasNext();) @@ -134,7 +132,7 @@ public class JxrBean path = new File(getBasedir(),path).getCanonicalPath(); pkgmgr.process(path); - new JXR(path, destDir, javadocLinkDir, "HEAD"); + new JXR(pkgmgr, path, destDir, javadocLinkDir, "HEAD"); } // once we have all the source files xref'd, create the index pages diff --git a/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java b/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java index b16e9b58..fb12f162 100644 --- a/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java +++ b/jxr/src/main/org/apache/maven/jxr/pacman/PackageManager.java @@ -75,11 +75,6 @@ public class PackageManager */ private PackageType defaultPackage = new PackageType(); - /** - * The SingletonInstance of this PackageManager. - */ - public static PackageManager instance = new PackageManager(); - /** * Given the name of a package (Ex: org.apache.maven.util) obtain it from * the PackageManager @@ -191,14 +186,6 @@ public class PackageManager } - /** - * Gets the instance attribute of the PackageManager class - */ - public static PackageManager getInstance() - { - return instance; - } - /** * Simple logging facility */ diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml new file mode 100644 index 00000000..4faaff81 --- /dev/null +++ b/jxr/xdocs/changes.xml @@ -0,0 +1,16 @@ + + + + Changes + dIon Gillard + + + + + + Fix for bug Maven-178. + + + + +