[jbosstools-commits] JBoss Tools SVN: r19296 - in trunk/bpel/plugins: org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards and 1 other directory.

Author: Grid.Qian Date: 2009-12-16 00:59:22 -0500 (Wed, 16 Dec 2009) New Revision: 19296 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java Log: JBIDE-5452: Create New BPEL Process does not put it in the bpelContent folder Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-12-16 05:51:07 UTC (rev 19295) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-12-16 05:59:22 UTC (rev 19296) @@ -4,6 +4,7 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceDescription; import org.eclipse.core.resources.IWorkspaceRoot; @@ -108,30 +109,14 @@ Object obj = ssel.getFirstElement(); if (obj instanceof IResource) { - IContainer container; - if (obj instanceof IContainer) - container = (IContainer) obj; - else - container = ((IResource) obj).getParent(); - containerText.setText(container.getFullPath().toString()); - } else if (obj instanceof IJavaElement) { - - IPath path = ((IJavaElement) obj).getPath(); - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - if (!(obj instanceof IJavaProject)) { - IFolder containerFolder = root.getFolder(path); - while (!containerFolder.exists()) { - obj = ((IJavaElement) obj).getParent(); - if (obj instanceof IJavaElement) { - path = ((IJavaElement) obj).getPath(); - containerFolder = root.getFolder(path); - } - - } - } - if (path != null) { - containerText.setText(path.toOSString()); - } + IProject project; + project = ((IResource) obj).getProject(); + IContainer bpelContent = project.getFolder("bpelContent"); + if (bpelContent != null) { + containerText.setText(bpelContent.getFullPath().toString()); + } else { + containerText.setText(project.getFullPath().toString()); + } } } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2009-12-16 05:51:07 UTC (rev 19295) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2009-12-16 05:59:22 UTC (rev 19296) @@ -18,6 +18,7 @@ import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; @@ -82,7 +83,7 @@ public void init(IWorkbench workbench, IStructuredSelection currentSelection) { fWorkbench = workbench; - mContainer = getClosestContainer( currentSelection.getFirstElement() ); + mContainer = getBPELContainer( currentSelection.getFirstElement() ); } @@ -191,24 +192,32 @@ /** - * Return the closest container in which we can generate + * Return the BPEL files container in which we can generate * process from the template. * - * @return the closest IContainer + * @return the BPEL files IContainer */ - IContainer getClosestContainer ( Object obj ) { + IContainer getBPELContainer ( Object obj ) { if (obj == null) { return null; } + IProject project = null; if (obj instanceof IFile) { IFile file = (IFile) obj; - return file.getParent(); + project = file.getProject(); } if (obj instanceof IContainer) { - return (IContainer) obj; + IContainer container = (IContainer)obj; + project = container.getProject(); } + if (project != null) { + IContainer bpelContent = project.getFolder("bpelContent"); + if (bpelContent != null) { + return bpelContent; + } + } return null; }