Attachment 146303 Details for Bug 288391 – Proposed patch

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

[patch] Proposed patch

patch.txt (text/plain), 3.36 KB, created by Christine Rice

on 2009-09-02 13:48:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Rice

Created: 2009-09-02 13:48:43 EDT

Size: 3.36 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsf.facesconfig
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.xml,v
>retrieving revision 1.2
>diff -u -r1.2 plugin.xml
>--- plugin.xml	28 Nov 2006 20:22:00 -0000	1.2
>+++ plugin.xml	2 Sep 2009 14:45:06 -0000
>@@ -27,4 +27,12 @@
>           org.eclipse.emf.edit.provider.IItemPropertySource" />
>   </extension>
> 
>+
>+   <extension
>+         point="org.eclipse.wst.common.emfworkbench.integration.editModel">
>+      <editModel
>+            editModelID="jsf.facesconfig"
>+            factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
>+      </editModel>
>+   </extension>
> </plugin>
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF,v
>retrieving revision 1.19
>diff -u -r1.19 MANIFEST.MF
>--- META-INF/MANIFEST.MF	27 Aug 2009 13:36:54 -0000	1.19
>+++ META-INF/MANIFEST.MF	2 Sep 2009 14:45:06 -0000
>@@ -15,7 +15,8 @@
>  org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
>- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,2.0.0)"
>+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,2.0.0)",
>+ org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,2.0.0)"
> Bundle-ActivationPolicy: lazy
> Export-Package: org.eclipse.jst.jsf.facesconfig,
>  org.eclipse.jst.jsf.facesconfig.edit.provider,
>Index: facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigArtifactEdit.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigArtifactEdit.java,v
>retrieving revision 1.9
>diff -u -r1.9 FacesConfigArtifactEdit.java
>--- facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigArtifactEdit.java	5 May 2008 22:46:13 -0000	1.9
>+++ facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigArtifactEdit.java	2 Sep 2009 14:45:07 -0000
>@@ -37,13 +37,16 @@
> 	private URI facesConfigURI = URI.createURI(IFacesConfigConstants.FACES_CONFIG_URI);
> 	private boolean bRegistered = false;
> 
>+	// The id from our use of the org.eclipse.wst.common.emfworkbench.integration.editModel extension
>+	private static final String EDIT_MODEL_ID = "jsf.facesconfig"; //$NON-NLS-1$
>+	
> 	/**
> 	 * @param aProject
> 	 * @param toAccessAsReadOnly
> 	 * @throws IllegalArgumentException
> 	 */
> 	public FacesConfigArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
>-		super(aProject, toAccessAsReadOnly);
>+		super(aProject, toAccessAsReadOnly, false, EDIT_MODEL_ID);
> 	}
> 
> 	/**
>@@ -174,6 +177,10 @@
> 	 */
> 	public void setFilename(String filename) {
> 		sFileName = filename;
>+		// Keep the fileName and URI in sync
>+		if(filename != null && !("").equals(filename)) { //$NON-NLS-1$
>+			facesConfigURI = URI.createURI(filename);			
>+		}
> 	}
> 
> 	// TODO: appears to be dead

Flags:

raghunathan.srinivasan: iplog+

Actions: View | Diff

Attachments on bug 288391: 146303