Attachment 79230 Details for Bug 199229 – Updated patch (works for both 1.5.x and 2.0.x)

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

[patch] Updated patch (works for both 1.5.x and 2.0.x)

bug199299wtp15patch2 (text/plain), 5.77 KB, created by Carl Anderson

on 2007-09-26 15:01:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2007-09-26 15:01:17 EDT

Size: 5.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.common.modulecore
>Index: modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java,v
>retrieving revision 1.33.4.1
>diff -u -r1.33.4.1 VirtualResource.java
>--- modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java	28 Sep 2006 17:01:20 -0000	1.33.4.1
>+++ modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java	26 Sep 2007 18:59:12 -0000
>@@ -243,23 +243,27 @@
> 	public void setResourceType(String aResourceType) {
> 		resourceType = aResourceType; 
> 		WorkbenchComponent aComponent = getReadOnlyComponent();
>-		ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
>-		for (int i = 0; i < resources.length; i++) {
>-			resources[i].setResourceType(aResourceType);
>+		if (aComponent != null)	{
>+			ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
>+			for (int i = 0; i < resources.length; i++) {
>+				resources[i].setResourceType(aResourceType);
>+			}
> 		}
>-		 
> 	}
> 
> 	// TODO Fetch the resource type from the model.
> 	public String getResourceType() {
> 		if (null == resourceType) { 
> 			WorkbenchComponent aComponent = getReadOnlyComponent();
>-			ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
>-			for (int i = 0; i < resources.length; i++) {
>-				resourceType = resources[i].getResourceType();
>-				return resourceType;
>+			if (aComponent != null)
>+			{
>+				ComponentResource[] resources = aComponent
>+					.findResourcesByRuntimePath(getRuntimePath());
>+				if (resources.length > 0) {
>+					resourceType = resources[0].getResourceType();
>+					return resourceType;
>+				}
> 			}
>-			 
> 		}
> 		resourceType = ""; //$NON-NLS-1$
> 		return resourceType;
>@@ -314,8 +318,10 @@
> 		WorkbenchComponent component = null;
> 		try {
> 			moduleCore = StructureEdit.getStructureEditForRead(getProject());
>-			component = moduleCore.getComponent();
>-			mapping.mark(getProject(), component);
>+			if (moduleCore != null) {
>+				component = moduleCore.getComponent();
>+				mapping.mark(getProject(), component);
>+			}	
> 		} finally {
> 			if (moduleCore != null) { 
> 				moduleCore.dispose();
>Index: modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java,v
>retrieving revision 1.32.2.1
>diff -u -r1.32.2.1 VirtualContainer.java
>--- modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java	28 Sep 2006 17:01:20 -0000	1.32.2.1
>+++ modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java	26 Sep 2007 18:59:12 -0000
>@@ -77,29 +77,36 @@
> 		try {
> 
> 			structureEdit = StructureEdit.getStructureEditForRead(getProject());
>-			WorkbenchComponent component = structureEdit.getComponent();
>-			if (null != component) {
>-				ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
>-				ComponentResource[] resources = root.findModuleResources(getRuntimePath().append(aPath), ResourceTreeNode.CREATE_NONE);
>-
>-				for (int i = 0; i < resources.length; i++) {
>-				// return the resources corresponding to the root, not any of the children if its a folder
>-					if (resources[i].getRuntimePath().equals(getRuntimePath().append(aPath))) {
>-						IResource platformResource = getProject().findMember(resources[i].getSourcePath());
>-						if (platformResource == null)
>-							platformResource = ResourcesPlugin.getWorkspace().getRoot().findMember(resources[i].getSourcePath());
>-						if (platformResource != null) {
>-							switch (platformResource.getType()) {
>-								case IResource.FOLDER :
>-								case IResource.PROJECT :
>-									return ComponentCore.createFolder(getProject(), getRuntimePath().append(aPath));
>-								case IResource.FILE :
>-									return new VirtualFile(getProject(), getRuntimePath().append(aPath));
>+			if (structureEdit != null)  // bug 199229
>+				{
>+				WorkbenchComponent component = structureEdit.getComponent();
>+				if (null != component) 
>+					{
>+					ResourceTreeRoot root = ResourceTreeRoot.getDeployResourceTreeRoot(component);
>+					ComponentResource[] resources = root.findModuleResources(getRuntimePath().append(aPath), ResourceTreeNode.CREATE_NONE);
>+	
>+					for (int i = 0; i < resources.length; i++) 
>+						{
>+						// return the resources corresponding to the root, not any of the children if its a folder
>+						if (resources[i].getRuntimePath().equals(getRuntimePath().append(aPath))) {
>+							IResource platformResource = getProject().findMember(resources[i].getSourcePath());
>+							if (platformResource == null)
>+								platformResource = ResourcesPlugin.getWorkspace().getRoot().findMember(resources[i].getSourcePath());
>+							if (platformResource != null) 
>+								{
>+								switch (platformResource.getType()) 
>+									{
>+									case IResource.FOLDER :
>+									case IResource.PROJECT :
>+										return ComponentCore.createFolder(getProject(), getRuntimePath().append(aPath));
>+									case IResource.FILE :
>+										return new VirtualFile(getProject(), getRuntimePath().append(aPath));
>+									}
>+								}
> 							}
> 						}
> 					}
> 				}
>-			}
> 		} finally {
> 			if (structureEdit != null)
> 				structureEdit.dispose();

Actions: View | Diff

Attachments on bug 199229: 75648 | 79229 | 79230 | 79350 | 79351