Attachment 155935 Details for Bug 299437 – patch for 3.0.5

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

[patch] patch for 3.0.5

299437.txt (text/plain), 2.38 KB, created by Jason Sholl

on 2010-01-12 17:17:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Sholl

Created: 2010-01-12 17:17:26 EST

Size: 2.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java,v
>retrieving revision 1.34.2.4.6.1
>diff -u -r1.34.2.4.6.1 AddComponentToEnterpriseApplicationOp.java
>--- earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java	18 Nov 2009 01:52:26 -0000	1.34.2.4.6.1
>+++ earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java	24 Nov 2009 15:55:24 -0000
>@@ -138,20 +138,22 @@
> 										final ICommonApplication application = (ICommonApplication)earModel.getModelObject();
> 										if(application != null) {
> 											ICommonModule mod = addModule(application, wc, (String) map.get(wc));
>-											if (ref!=null)
>-												ref.setDependentObject((EObject)mod);
>-											if (JavaEEProjectUtilities.isStaticWebProject(wc.getProject())
>-													|| JavaEEProjectUtilities.isDynamicWebComponent(wc)) {
>-												updateContextRoot(earpj, wc, mod);
>-											}
>-											
>-											Resource theResource = ((EObject)mod).eResource();
>-											if (theResource != null)
>-											{
>-												String frag = null;
>-												if (theResource instanceof CompatibilityXMIResource)
>-													frag = theResource.getURIFragment((EObject)mod);
>-												((ICommonEMFModule)mod).setId(frag);
>+											if(mod != null){
>+												if (ref!=null)
>+													ref.setDependentObject((EObject)mod);
>+												if (JavaEEProjectUtilities.isStaticWebProject(wc.getProject())
>+														|| JavaEEProjectUtilities.isDynamicWebComponent(wc)) {
>+													updateContextRoot(earpj, wc, mod);
>+												}
>+												
>+												Resource theResource = ((EObject)mod).eResource();
>+												if (theResource != null)
>+												{
>+													String frag = null;
>+													if (theResource instanceof CompatibilityXMIResource)
>+														frag = theResource.getURIFragment((EObject)mod);
>+													((ICommonEMFModule)mod).setId(frag);
>+												}
> 											}
> 										}
> 									}

Actions: View | Diff

Attachments on bug 299437: 155935