Attachment 179422 Details for Bug 326015 – Revert the changes

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

[patch] Revert the changes

patch.txt (text/plain), 2.20 KB, created by Carl Anderson

on 2010-09-22 17:55:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2010-09-22 17:55:47 EDT

Size: 2.20 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java,v
>retrieving revision 1.12.14.7
>diff -u -r1.12.14.7 EARVirtualComponent.java
>--- earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java	30 Aug 2010 16:16:26 -0000	1.12.14.7
>+++ earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java	22 Sep 2010 20:49:48 -0000
>@@ -161,20 +161,19 @@
> 			for (int i = 0; i < members.length; i++) {
> 				if (IVirtualResource.FILE == members[i].getType()) {
> 					if(folder.isDynamicComponent((IVirtualFile)members[i])){
>-						IPath archiveFullPath = new Path(members[i].getRuntimePath().toString());
>+						String archiveName = members[i].getRuntimePath().toString().substring(1);
> 						boolean shouldInclude = true;
> 						for (int j = 0; j < hardReferences.size() && shouldInclude; j++) {
>-							IVirtualReference tmpRef = ((IVirtualReference) hardReferences.get(j));
>-							IPath tmpFullPath = tmpRef.getRuntimePath().append(tmpRef.getArchiveName());
>-							if( tmpFullPath.equals(archiveFullPath))
>+							String tempArchiveName = ((IVirtualReference) hardReferences.get(j)).getArchiveName();
>+							if (null != tempArchiveName && tempArchiveName.equals(archiveName)) {
> 								shouldInclude = false;
>+							}
> 						}
> 						if (shouldInclude) {
> 							IResource iResource = members[i].getUnderlyingResource();
> 							IVirtualComponent dynamicComponent = ComponentCore.createArchiveComponent(earComponent.getProject(), VirtualArchiveComponent.LIBARCHIVETYPE + iResource.getFullPath().toString());
> 							IVirtualReference dynamicRef = ComponentCore.createReference(earComponent, dynamicComponent);
>-							dynamicRef.setArchiveName(archiveFullPath.lastSegment());
>-							dynamicRef.setRuntimePath(archiveFullPath.removeLastSegments(1));
>+							dynamicRef.setArchiveName(archiveName);
> 							if (null == dynamicReferences) {
> 								dynamicReferences = new ArrayList();
> 							}

Actions: View | Diff

Attachments on bug 326015: 179422