[jbosstools-commits] JBoss Tools SVN: r29834 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards.

Author: bbrodt Date: 2011-03-16 18:17:26 -0400 (Wed, 16 Mar 2011) New Revision: 29834 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 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/NewFileWizardPage1.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties Log: https://issues.jboss.org/browse/JBIDE-8591 added warning message to New File Wizard if user attempts to create a BPEL process file in a non-faceted project Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2011-03-16 22:06:11 UTC (rev 29833) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2011-03-16 22:17:26 UTC (rev 29834) @@ -56,6 +56,8 @@ public static String NewFileWizardPage2_3; public static String NewFileWizardPage1_Name; public static String NewFileWizardPage2_Name; + // https://issues.jboss.org/browse/JBIDE-8591 + public static String NewFileWizard_Not_A_Faceted_Project; public static String NewFileWizard_WSDLCustomPage_Name; public static String NewFileWizard_WSDLCustomPage_Title; public static String NewFileWizard_WSDLCustomPage_Description; 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 2011-03-16 22:06:11 UTC (rev 29833) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-03-16 22:17:26 UTC (rev 29834) @@ -17,11 +17,13 @@ import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.Templates.Template; +import org.eclipse.core.internal.resources.Folder; 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.core.runtime.IPath; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Display; @@ -31,6 +33,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.ModuleCoreNature; @@ -212,6 +215,8 @@ IContainer getBPELContainer(Object obj) { + IContainer bpelContent = null; + if (obj == null) { return null; } @@ -225,12 +230,22 @@ project = container.getProject(); } if (project != null) { - IContainer bpelContent = project.getFolder(getWebContentRootPath(project)); - if (bpelContent != null) { - return bpelContent; + // https://issues.jboss.org/browse/JBIDE-8591 + // if not a faceted project, still allow resources to be created + IPath rootPath = getWebContentRootPath(project); + if (rootPath!=null && !rootPath.isEmpty()) { + bpelContent = project.getFolder(rootPath); } } - return null; + if (bpelContent == null) { + // https://issues.jboss.org/browse/JBIDE-8591 + // use folder or project + if (obj instanceof IContainer) + bpelContent = (IContainer)obj; + else + bpelContent = project; + } + return bpelContent; } static IPath getWebContentRootPath(IProject project) { @@ -248,6 +263,16 @@ return path; } + // https://issues.jboss.org/browse/JBIDE-8591 + // added to allow first and last page access to resource container + public IResource getBPELContainer() { + return mContainer; + } + + public void setBPELContainer(IContainer container) { + mContainer = container; + } + /** * @return the currently selected Template * @see https://jira.jboss.org/browse/JBIDE-7165 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2011-03-16 22:06:11 UTC (rev 29833) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2011-03-16 22:17:26 UTC (rev 29834) @@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; /** * @@ -360,8 +361,14 @@ } setErrorMessage(null); - setMessage(null); + // https://issues.jboss.org/browse/JBIDE-8591 + NewFileWizard wiz = (NewFileWizard)getWizard(); + if (!ModuleCoreNature.isFlexibleProject(wiz.getBPELContainer().getProject())) + setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING); + else + setMessage(null); + String namespace = processNamespaceField.getText().trim(); if (namespace.length() < 1) { setErrorMessage(Messages.NewFileWizardPage1_11); @@ -457,6 +464,8 @@ super.setVisible(visible); if (visible) { processNameField.setFocus(); + // https://issues.jboss.org/browse/JBIDE-8591 + validatePage(); } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-03-16 22:06:11 UTC (rev 29833) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-03-16 22:17:26 UTC (rev 29834) @@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; /** * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) @@ -54,26 +55,36 @@ */ public void createControl (Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); + final NewFileWizard wiz = (NewFileWizard) getWizard(); + Composite composite = new Composite(parent, SWT.NULL); - initializeDialogUnits(parent); + initializeDialogUnits(parent); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - - // Start Resource Variant - fResourceComposite = new FileSelectionGroup(composite, - new Listener() { - public void handleEvent(Event event) { - IResource resource = fResourceComposite.getSelectedResource(); - setPageComplete( resource != null && resource instanceof IContainer ); - } - }, - - Messages.NewFileWizardPage2_1, - Messages.NewFileWizardPage2_2 ); - - setControl( composite ); + composite.setLayout(new GridLayout()); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + + // Start Resource Variant + fResourceComposite = new FileSelectionGroup(composite, + new Listener() { + public void handleEvent(Event event) { + IResource resource = fResourceComposite.getSelectedResource(); + setPageComplete(resource != null && resource instanceof IContainer); + // https://issues.jboss.org/browse/JBIDE-8591 + if (!ModuleCoreNature.isFlexibleProject(resource.getProject())) + setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING); + else + setMessage(null); + + if (resource instanceof IContainer) + wiz.setBPELContainer((IContainer)resource); + } + }, + Messages.NewFileWizardPage2_1, + Messages.NewFileWizardPage2_2); + // https://issues.jboss.org/browse/JBIDE-8591 + // update wizard so first page gets the new resource location + fResourceComposite.setSelectedResource(wiz.getBPELContainer()); + setControl(composite); } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2011-03-16 22:06:11 UTC (rev 29833) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2011-03-16 22:17:26 UTC (rev 29834) @@ -23,6 +23,7 @@ NewFileWizard_WSDLCustomPage_PortLabel=Port Name NewFileWizard_WSDLCustomPage_AddressLabel=Service Address NewFileWizard_WSDLCustomPage_BindingLabel=Binding Protocol +NewFileWizard_Not_A_Faceted_Project=The selected location is not a faceted project. Error_NewFileWizard_WSDLCustomPage_Name_Empty=Specify a {0} for the BPEL process in the WSDL file. Error_NewFileWizard_WSDLCustomPage_Name_Space={0} must not include a space. Error_NewFileWizard_WSDLCustomPage_Protocol=The Binding Protocol must be 'SOAP' or 'HTTP'.