Attachment 210118 Details for Bug 358652 – Proposed patch

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

[patch] Proposed patch

bug358652.patch (text/plain), 3.37 KB, created by Roberto Sanchez Herrera

on 2012-01-26 10:22:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Roberto Sanchez Herrera

Created: 2012-01-26 10:22:22 EST

Size: 3.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee
>Index: j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java,v
>retrieving revision 1.48
>diff -u -r1.48 J2EEModuleFacetInstallDataModelProvider.java
>--- j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java	14 Apr 2011 14:17:05 -0000	1.48
>+++ j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java	26 Jan 2012 15:20:56 -0000
>@@ -22,6 +22,7 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
> import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
>@@ -32,6 +33,7 @@
> import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
>+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences.Keys;
> import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
> import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
> import org.eclipse.osgi.util.NLS;
>@@ -209,6 +211,25 @@
>             	if( config instanceof JavaFacetInstallConfig )
>             	{
>             		this.javaFacetInstallConfig = (JavaFacetInstallConfig) config;
>+            		
>+            		String providerId = model.getID();
>+            		if(providerId != "") //$NON-NLS-1$
>+            		{
>+            			if (providerId.indexOf("WebFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
>+            			{ this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.DYN_WEB_OUTPUT_FOLDER))); }
>+            			else            			
>+            				if(providerId.indexOf("EjbFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
>+            				{ this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.EJB_OUTPUT_FOLDER))); }
>+            				else
>+            					if(providerId.indexOf("AppClientFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
>+            					{ this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.APP_CLIENT_OUTPUT_FOLDER))); }
>+            					else
>+                					if(providerId.indexOf("ConnectorFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
>+                					{ this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.JCA_OUTPUT_FOLDER))); }
>+                					else
>+                    					if(providerId.indexOf("UtilityFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
>+                    					{ this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getUtilityOutputFolderName())); }
>+            		}
>             	}
>             	else
>             	{

Actions: View | Diff

Attachments on bug 358652: 210118