Attachment #157872 for bug #301151

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




		IFlatFolder mf = (FlatFolder) getExistingModuleResource(members,path.append(container.getName()).makeRelative());
		if( mf == null ) {
			mf = new FlatFolder(container, container.getName(), path);
			IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
			if (path.isEmpty())
				members.add(mf);
			else {
				if (parent == null)
					parent = ensureParentExists(members, path, container);
				addMembersToModuleFolder(parent, new IFlatResource[] {mf});
			}
		}
		IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
		if (path.isEmpty())
			members.add(mf);
		else {
			if (parent == null)
				parent = ensureParentExists(members, path, container);
			addMembersToModuleFolder(parent, new IFlatResource[] {mf});
		}
		
		// recurse
		addContainer(container, path.append(container.getName()));
	}

	public static FlatFile createModuleFile(final IFile file, final IPath path) {
		return new FlatFile(file, file.getName(), path);
	}
	
	public static File extractFileFromFlatFile(IFlatFile resource) {
		File f = (File)resource.getAdapter(File.class);
		if (f == null) {
			IFile ifile = (IFile)resource.getAdapter(IFile.class);
			if (ifile != null) 
				f = ifile.getLocation().toFile();
		}
		return f;
	}

	
	/**

Return to bug 301151

Lines 71-86 Link Here

(-)modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java (-9 / +18 lines)
71	IFlatFolder mf = (FlatFolder) getExistingModuleResource(members,path.append(container.getName()).makeRelative());	71	IFlatFolder mf = (FlatFolder) getExistingModuleResource(members,path.append(container.getName()).makeRelative());
72	if( mf == null ) {	72	if( mf == null ) {
73	mf = new FlatFolder(container, container.getName(), path);	73	mf = new FlatFolder(container, container.getName(), path);
		74	IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
		75	if (path.isEmpty())
		76	members.add(mf);
		77	else {
		78	if (parent == null)
		79	parent = ensureParentExists(members, path, container);
		80	addMembersToModuleFolder(parent, new IFlatResource[] {mf});
		81	}
74	}	82	}
75	IFlatFolder parent = (FlatFolder) getExistingModuleResource(members, path);
76	if (path.isEmpty())
77	members.add(mf);
78	else {
79	if (parent == null)
80	parent = ensureParentExists(members, path, container);
81	addMembersToModuleFolder(parent, new IFlatResource[] {mf});
82	}
83
84	// recurse	83	// recurse
85	addContainer(container, path.append(container.getName()));	84	addContainer(container, path.append(container.getName()));
86	}	85	}
Lines 156-161 Link Here
156	public static FlatFile createModuleFile(final IFile file, final IPath path) {	155	public static FlatFile createModuleFile(final IFile file, final IPath path) {
157	return new FlatFile(file, file.getName(), path);	156	return new FlatFile(file, file.getName(), path);
158	}	157	}
		158
		159	public static File extractFileFromFlatFile(IFlatFile resource) {
		160	File f = (File)resource.getAdapter(File.class);
		161	if (f == null) {
		162	IFile ifile = (IFile)resource.getAdapter(IFile.class);
		163	if (ifile != null)
		164	f = ifile.getLocation().toFile();
		165	}
		166	return f;
		167	}
159		168
160		169
161	/**	170	/**