Attachment 101351 Details for Bug 233165 – Add checks to see if the component file has content

[patch] Add checks to see if the component file has content

emfbug231430patch (text/plain), 1.51 KB, created by Carl Anderson

on 2008-05-21 15:28:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2008-05-21 15:28:18 EDT

Size: 1.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.common.modulecore
>Index: modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
>===================================================================
>RCS file: /cvsroot/webtools/common/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java,v
>retrieving revision 1.46
>diff -u -r1.46 ModuleStructuralModel.java
>--- modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java	7 Jun 2007 19:29:09 -0000	1.46
>+++ modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java	21 May 2008 16:37:17 -0000
>@@ -301,15 +301,15 @@
> 		
> 		URI uri = URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
> 		WTPModulesResource res = (WTPModulesResource)getResource(uri);
>-		if (res == null || !res.isLoaded()) {
>+		if (res == null || !res.isLoaded() || res.getContents().isEmpty()) {
> 			removeResource(res);
> 			uri = URI.createURI(R1_MODULE_META_FILE_NAME);
> 			res = (WTPModulesResource)getResource(uri);
>-			if (res == null || !res.isLoaded()) {
>+			if (res == null || !res.isLoaded() || res.getContents().isEmpty()) {
> 				removeResource(res);
> 				uri = URI.createURI(R0_7_MODULE_META_FILE_NAME);
> 				res = (WTPModulesResource)getResource(uri);
>-				if (res == null || !res.isLoaded()) {
>+				if (res == null || !res.isLoaded() || res.getContents().isEmpty()) {
> 					removeResource(res);
> 					res = null;
> 				}

Actions: View | Diff

Attachments on bug 233165: 101204 | 101205 | 101351