Attachment 112208 Details for Bug 246291 – patch for 155 (against stream with 237139 applied)

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

[patch] patch for 155 (against stream with 237139 applied)

J2EEFlexProj_246291_patch.txt (text/plain), 2.52 KB, created by Janelle Carroll

on 2008-09-10 10:43:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Janelle Carroll

Created: 2008-09-10 10:43:56 EDT

Size: 2.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java,v
>retrieving revision 1.63.2.2.2.5
>diff -u -r1.63.2.2.2.5 J2EEFlexProjDeployable.java
>--- j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java	10 Sep 2008 13:01:25 -0000	1.63.2.2.2.5
>+++ j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java	10 Sep 2008 14:39:13 -0000
>@@ -77,6 +77,7 @@
> 	private IContainer[] cachedOutputContainers;
> 	private HashMap cachedOutputMappings;
> 	private HashMap cachedSourceOutputPairs;
>+	private boolean isSingleJavaOutputNonSource = false;
> 
> 	/**
> 	 * Constructor for J2EEFlexProjDeployable.
>@@ -666,6 +667,7 @@
> 	 *    <code>false</code> otherwise
> 	 */
> 	public boolean isSingleRootStructure() {
>+		isSingleJavaOutputNonSource = false;
> 		StructureEdit edit = null;
> 		try {
> 			edit = StructureEdit.getStructureEditForRead(getProject());
>@@ -730,6 +732,7 @@
> 							// output folder (something like classes or bin) is not a source folder, JDT copies all files
> 							// (including non Java files) to this folder, so every resource needed at runtime is located 
> 							// in a single directory.
>+							isSingleJavaOutputNonSource = true;
> 							return true;
> 						} else {
> // Don't implement at this time. Currently, we claim single-rooted when ejbModlule is the output folder.  However,
>@@ -856,8 +859,12 @@
> 	 */
> 	private IModuleResource[] getOptimizedMembers() throws CoreException {
> 		if (component != null) {
>-			// For java utility modules, we can just use the output container, at this point we know there is only one
>-			if (J2EEProjectUtilities.isUtilityProject(getProject())) {
>+			if (isSingleJavaOutputNonSource) {
>+				// We determined when testing for a single root structure that this project has
>+				// one output folder and that output folder is not a source folder. Since the
>+				// output folder (for example, classes or bin) is not a source folder, JDT copies all files
>+				// (including non Java files) to this folder, so every resource needed at runtime is located 
>+				// in that single output directory.
> 				return getModuleResources(Path.EMPTY, getJavaOutputFolders()[0]);
> 			}
> 			// For J2EE modules, we use the contents of the content root

Actions: View | Diff

Attachments on bug 246291: 111731 | 112208