Attachment 144723 Details for Bug 286859 – Revised Patch

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

Revised Patch

286859.txt (text/plain), 3.30 KB, created by Zina Mostafia

on 2009-08-17 15:52:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zina Mostafia

Created: 2009-08-17 15:52:09 EDT

Size: 3.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.consumption.ui
>Index: src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java,v
>retrieving revision 1.1
>diff -u -r1.1 FacetOperationDelegate.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java	3 Mar 2009 21:38:18 -0000	1.1
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/common/FacetOperationDelegate.java	17 Aug 2009 19:53:35 -0000
>@@ -23,10 +23,15 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
>+import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>+import org.eclipse.jst.ws.internal.common.J2EEUtils;
> import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
> import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
> import org.eclipse.jst.ws.internal.consumption.common.IFacetOperationDelegate;
>@@ -53,6 +58,7 @@
> 			public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException {
> 				try {
> 					fproject.modify(actions, shellMonitor);
>+					fixEJBClassPath(fproject);
> 				} catch (CoreException e) {
> 					status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
> 				}
>@@ -71,6 +77,7 @@
> 		} else {
> 			try {
> 				fproject.modify(actions, null);
>+				fixEJBClassPath(fproject);
> 			} catch (CoreException e) {
> 				status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
> 			}
>@@ -79,6 +86,35 @@
> 		return status[0];
> 	}
> 
>+	private void fixEJBClassPath(IFacetedProject project) {
>+		if (!J2EEUtils.isEJBComponent(project.getProject())) return;
>+		IProject ejbProject = project.getProject();
>+		IJavaProject javaProject = JavaCore.create(ejbProject);
>+		Path projectRoot = new Path(Path.ROOT.append(new Path(ejbProject.getName())).toString());	
>+		try {
>+			IClasspathEntry[] originalSet = javaProject.getRawClasspath();
>+			boolean foundEJBModulEntry = false;
>+			for (IClasspathEntry entry : originalSet) {
>+				if (entry.getPath().equals(projectRoot.append("ejbModule")))
>+					foundEJBModulEntry = true;
>+			}
>+			if (!foundEJBModulEntry) {
>+				IClasspathEntry[] newSet = new IClasspathEntry[originalSet.length + 1];
>+				int i=0;
>+
>+				for (IClasspathEntry entry : originalSet) {
>+					newSet[i++] = entry;
>+				}
>+				newSet[i] = JavaCore.newSourceEntry(projectRoot.append("ejbModule"));
>+				javaProject.setRawClasspath(newSet,null);
>+			}
>+		}
>+		catch (Exception e) {
>+			// TODO: handle exception
>+		}
>+		
>+	}
>+
> 	public IStatus createNewFacetedProject(final String projectName) {
> 		final IStatus[] status = new IStatus[1];
> 		status[0] = Status.OK_STATUS;

Actions: View

Attachments on bug 286859: 144720 | 144723 | 144732 | 144862 | 144863 | 144869 | 144875