Attachment #170327 for bug #278294

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

View | Details | Raw Unified | Return to bug 278294
Collapse All | Expand All

Lines 76-84 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java (-3 / +9 lines)
76	if (componentTypes == null \|\| componentTypes.size() == 0) {	76	if (componentTypes == null \|\| componentTypes.size() == 0) {
77	components.add(refComponents[i]);	77	components.add(refComponents[i]);
78	} else {	78	} else {
79	IPath runtimePath2 = getRealRuntimePath(refComponents[i]);	79	if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
80	if (runtimePath2.equals(runtimePath) && componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {	80	if (runtimePath != null){
81	components.add(refComponents[i]);	81	IPath runtimePath2 = getRealRuntimePath(refComponents[i]);
		82	if (runtimePath2.equals(runtimePath)) {
		83	components.add(refComponents[i]);
		84	}
		85	} else {
		86	components.add(refComponents[i]);
		87	}
82	}	88	}
83	}	89	}
84	}	90	}

Lines 64-70 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java (-1 / +6 lines)
64		64
65	Path libPath = new Path("/"); //$NON-NLS-1$	65	Path libPath = new Path("/"); //$NON-NLS-1$
66	if (bundledLibsDirectoryNode == null){	66	if (bundledLibsDirectoryNode == null){
67	libPath = new Path("/" + recomputeLibFolder(getEarProject())); //$NON-NLS-1$	67	String modelLibPath = recomputeLibFolder(getEarProject());
		68	String prefix = "/"; //$NON-NLS-1$
		69	if (modelLibPath.startsWith(prefix)){
		70	prefix = ""; //$NON-NLS-1$
		71	}
		72	libPath = new Path(prefix + recomputeLibFolder(getEarProject()));
68	}	73	}
69		74
70	List libs = getComponentReferencesAsList(UTILITY, projectComponent,	75	List libs = getComponentReferencesAsList(UTILITY, projectComponent,

Lines 13-19 Link Here

(-)src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java (-2 / +1 lines)
13	import java.util.List;	13	import java.util.List;
14		14
15	import org.eclipse.core.resources.IProject;	15	import org.eclipse.core.resources.IProject;
16	import org.eclipse.core.runtime.Path;
17	import org.eclipse.jst.jee.ui.internal.Messages;	16	import org.eclipse.jst.jee.ui.internal.Messages;
18	import org.eclipse.wst.common.componentcore.ComponentCore;	17	import org.eclipse.wst.common.componentcore.ComponentCore;
19	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	18	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
Lines 45-50 Link Here
45	@Override	44	@Override
46	public List getModules() {	45	public List getModules() {
47	IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());	46	IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
48	return getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, new Path("/")); //$NON-NLS-1$	47	return getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, null);
49	}	48	}
50	}	49	}

Return to bug 278294