Attachment 152911 Details for Bug 295946 – Two minor fixes.

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

[patch] Two minor fixes.

bug295946part2.patch (text/plain), 2.81 KB, created by Carl Anderson

on 2009-11-23 18:57:33 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2009-11-23 18:57:33 EST

Size: 2.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.jca
>Index: jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java,v
>retrieving revision 1.31
>diff -u -r1.31 ConnectorFacetInstallDelegate.java
>--- jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java	23 Nov 2009 23:08:27 -0000	1.31
>+++ jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java	23 Nov 2009 23:59:42 -0000
>@@ -41,7 +41,6 @@
> import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
> import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
>-import org.eclipse.jst.j2ee.jca.Connector;
> import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
> import org.eclipse.jst.j2ee.model.IModelProvider;
> import org.eclipse.jst.j2ee.model.ModelProviderManager;
>@@ -51,6 +50,7 @@
> import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
> import org.eclipse.jst.javaee.core.DisplayName;
> import org.eclipse.jst.javaee.core.JavaeeFactory;
>+import org.eclipse.jst.javaee.jca.Connector;
> import org.eclipse.wst.common.componentcore.ComponentCore;
> import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
> import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
>@@ -165,7 +165,7 @@
> 					ConnectorArtifactEdit edit = null;
> 					try{
> 						edit = new ConnectorArtifactEdit(project, false, true);
>-						Connector connector = edit.getConnector();
>+						org.eclipse.jst.j2ee.jca.Connector connector = edit.getConnector();
> 						connector.setDisplayName(project.getName());
> 						edit.saveIfNecessary(new NullProgressMonitor());
> 					}finally{
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.jca/plugin.xml,v
>retrieving revision 1.44
>diff -u -r1.44 plugin.xml
>--- plugin.xml	23 Nov 2009 23:08:27 -0000	1.44
>+++ plugin.xml	23 Nov 2009 23:59:42 -0000
>@@ -25,9 +25,11 @@
>          name="%connector_validator_UI_"
>          point="org.eclipse.wst.validation.validator">
>       <validator>
>-         <facet
>-               facetId="jst.connector">
>-         </facet>
>+         <enablement>
>+      		<and>
>+        		<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.5]"/>
>+			</and>
>+		</enablement>
>           <contentTypeBinding
>                contentTypeId="org.eclipse.jst.j2ee.connectorDD">
>          </contentTypeBinding>

Actions: View | Diff

Attachments on bug 295946: 152909 | 152911