Attachment 170327 Details for Bug 278294 – added support for nested modules and fixes inlib dir showing in the DD tree

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] added support for nested modules and fixes inlib dir showing in the DD tree

nested_modules_and_lib_foderfixes.patch (text/plain), 3.56 KB, created by Dimitar Giormov

on 2010-05-28 06:50:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitar Giormov

Created: 2010-05-28 06:50:44 EDT

Size: 3.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jee.ui
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java,v
>retrieving revision 1.5
>diff -u -r1.5 AbstractEarNode.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java	13 Nov 2008 19:02:01 -0000	1.5
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java	28 May 2010 10:45:52 -0000
>@@ -76,9 +76,15 @@
> 				if (componentTypes == null || componentTypes.size() == 0) {
> 					components.add(refComponents[i]);
> 				} else {
>-					IPath runtimePath2 = getRealRuntimePath(refComponents[i]);
>-					if (runtimePath2.equals(runtimePath) && componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
>-						components.add(refComponents[i]);
>+					if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
>+						if (runtimePath != null){
>+							IPath runtimePath2 = getRealRuntimePath(refComponents[i]);
>+							if (runtimePath2.equals(runtimePath)) {
>+								components.add(refComponents[i]);
>+							}
>+						} else {
>+							components.add(refComponents[i]);
>+						}	
> 					}
> 				}
> 			}
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java,v
>retrieving revision 1.5
>diff -u -r1.5 BundledNode.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java	13 Nov 2008 19:02:01 -0000	1.5
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java	28 May 2010 10:45:52 -0000
>@@ -64,7 +64,12 @@
> 
> 		Path libPath = new Path("/"); //$NON-NLS-1$
> 		if (bundledLibsDirectoryNode == null){
>-			libPath = new Path("/" + recomputeLibFolder(getEarProject())); //$NON-NLS-1$
>+			String modelLibPath = recomputeLibFolder(getEarProject());
>+			String prefix = "/"; //$NON-NLS-1$
>+			if (modelLibPath.startsWith(prefix)){
>+				prefix = ""; //$NON-NLS-1$
>+			}
>+			libPath = new Path(prefix + recomputeLibFolder(getEarProject())); 
> 		}
> 		
> 		List libs = getComponentReferencesAsList(UTILITY, projectComponent,
>Index: src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java,v
>retrieving revision 1.4
>diff -u -r1.4 ModulesNode.java
>--- src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java	9 Jun 2009 19:30:02 -0000	1.4
>+++ src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java	28 May 2010 10:45:52 -0000
>@@ -13,7 +13,6 @@
> import java.util.List;
> 
> import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.runtime.Path;
> import org.eclipse.jst.jee.ui.internal.Messages;
> import org.eclipse.wst.common.componentcore.ComponentCore;
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
>@@ -45,6 +44,6 @@
> 	 @Override
> 	public List getModules() {
> 	    	IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
>-	    	return getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, new Path("/")); //$NON-NLS-1$
>+	    	return getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, null);
> 	 }
> }

Actions: View | Diff

Attachments on bug 278294: 170327