Bug 520996 - [9] JavaDocLocations should support module doc

Change-Id: I9c2e9084680e342851ac7f57432729be2db135d0
Signed-off-by: kalyan prasad <kalyan_prasad@in.ibm.com>

1 files changed, 22 insertions, 2 deletions

diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/javadoc/JavaDocLocations.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/javadoc/JavaDocLocations.java
index e76a536bf5..4e80e39790 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/javadoc/JavaDocLocations.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/javadoc/JavaDocLocations.java
@@ -32,7 +32,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.ui.PlatformUI;
 
 import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClassFile;
 import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IClasspathContainer;
 import org.eclipse.jdt.core.IClasspathEntry;
@@ -44,7 +43,10 @@ import org.eclipse.jdt.core.IJavaModelStatusConstants;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IMember;
 import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IModularClassFile;
+import org.eclipse.jdt.core.IModuleDescription;
 import org.eclipse.jdt.core.IOpenable;
+import org.eclipse.jdt.core.IOrdinaryClassFile;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.IType;
@@ -248,7 +250,15 @@ public class JavaDocLocations {
 				appendTypePath(mainType, pathBuffer);
 				break;
 			case IJavaElement.CLASS_FILE :
-				appendTypePath(((IClassFile) element).getType(), pathBuffer);
+				if (element instanceof IModularClassFile) {
+					try {
+						appendModuleSummaryPath(((IModularClassFile) element).getModule(), pathBuffer);
+					} catch (JavaModelException e) {
+						return null;
+					}
+				} else {
+					appendTypePath(((IOrdinaryClassFile) element).getType(), pathBuffer);
+				}
 				break;
 			case IJavaElement.TYPE :
 				appendTypePath((IType) element, pathBuffer);
@@ -293,6 +303,10 @@ public class JavaDocLocations {
 					return null;
 				}
 				break;
+			case IJavaElement.JAVA_MODULE:
+				IModuleDescription module= (IModuleDescription) element;
+				appendModuleSummaryPath(module, pathBuffer);
+				break;	
 			default :
 				return null;
 		}
@@ -319,6 +333,12 @@ public class JavaDocLocations {
 		buf.append("/package-summary.html"); //$NON-NLS-1$
 	}
 
+	private static void appendModuleSummaryPath(IModuleDescription module, StringBuffer buf) {
+		String moduleName= module.getElementName();
+		buf.append(moduleName);
+		buf.append("-summary.html"); //$NON-NLS-1$
+	}
+
 	private static void appendIndexPath(StringBuffer buf) {
 		buf.append("index.html"); //$NON-NLS-1$
 	}