Attachment 45116 Details for Bug 148203 – Proposed patch

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

[patch] Proposed patch

ComponentDeployableForGunnarFix.txt (text/plain), 1.76 KB, created by John Lanuti

on 2006-06-22 15:32:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Lanuti

Created: 2006-06-22 15:32:41 EDT

Size: 1.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.web
>Index: static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/web/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java,v
>retrieving revision 1.11
>diff -u -r1.11 ComponentDeployable.java
>--- static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java	13 Jun 2006 21:27:52 -0000	1.11
>+++ static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java	22 Jun 2006 19:32:27 -0000
>@@ -122,7 +122,7 @@
> 				// Retrieve already existing module folder if applicable
> 				ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath);
> 				if (mf == null) {
>-					mf = new ModuleFolder(cc, cc.getName(), newPath);
>+					mf = new ModuleFolder(cc, cc.getName(), path);
> 					ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
> 					if (path.isEmpty())
> 						members.add(mf);
>@@ -246,7 +246,7 @@
>     		// Otherwise, if it is a folder, check its children for the existing resource path
>     		// but only check if the beginning segments are a match
> 	    	if(moduleResource instanceof IModuleFolder && 
>-	    			startsWith(moduleSegments, pathSegments) && 
>+	    			startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
> 	    			moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))	    	  
>     			if (((IModuleFolder)moduleResource).members()!=null)
>     				return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);

Actions: View | Diff

Attachments on bug 148203: 45084 | 45095 | 45116