Author: bbrodt Date: 2011-04-21 15:30:38 -0400 (Thu, 21 Apr 2011) New Revision: 30718 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/NewFileWizardPage1.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java Log: https://issues.jboss.org/browse/JBIDE-8591 Fixed project and duplicate filename checking 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-04-21 19:27:02 UTC (rev 30717) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-04-21 19:30:38 UTC (rev 30718) @@ -265,7 +265,7 @@ // https://issues.jboss.org/browse/JBIDE-8591 // added to allow first and last page access to resource container - public IResource getBPELContainer() { + public IContainer getBPELContainer() { return mContainer; } @@ -289,7 +289,7 @@ @Override public boolean canFinish() { - return (fMainPage.isPageComplete() && wsdlPage.isPageComplete() && mContainer != null) + return (fMainPage.isPageComplete() && wsdlPage.isPageComplete() && fContainerPage.isPageComplete() && mContainer != null) || super.canFinish(); } 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-04-21 19:27:02 UTC (rev 30717) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2011-04-21 19:30:38 UTC (rev 30718) @@ -60,8 +60,6 @@ /** last namespace used in creating a project, saved in dialog settings */ static final String LAST_NAMESPACE_KEY = "last.namespace.used"; //$NON-NLS-1$ - private IContainer mContainer; - /** Process name field */ private Text processNameField; @@ -365,26 +363,25 @@ } setErrorMessage(null); + setMessage(null); // https://issues.jboss.org/browse/JBIDE-8591 NewFileWizard wiz = (NewFileWizard)getWizard(); // https://issues.jboss.org/browse/JBIDE-8738 - if (wiz.getBPELContainer()!=null) { - if (!ModuleCoreNature.isFlexibleProject(wiz.getBPELContainer().getProject())) + IContainer container = wiz.getBPELContainer(); + if (container!=null) { + if (!ModuleCoreNature.isFlexibleProject(container.getProject())) setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING); + + if (container.findMember(processNameField.getText()+".bpel")!=null ) //$NON-NLS-1$ + setMessage(Messages.NewFileWizardPage1_12,WARNING); } - else - setMessage(null); String namespace = processNamespaceField.getText().trim(); if (namespace.length() < 1) { setErrorMessage(Messages.NewFileWizardPage1_11); return false; } - - if (mContainer!=null && mContainer.findMember(processNameField.getText()+".bpel")!=null ) { //$NON-NLS-1$ - setMessage(Messages.NewFileWizardPage1_12,WARNING); - } String bpelNamespace = (isAbstractOptionButtonChecked()) ? BPELConstants.NAMESPACE_ABSTRACT_2007 : BPELConstants.NAMESPACE; @@ -502,9 +499,4 @@ return mArgs; } - - public void setContainer(IContainer mContainer) { - this.mContainer = mContainer; - } - } 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-04-21 19:27:02 UTC (rev 30717) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-04-21 19:30:38 UTC (rev 30718) @@ -31,16 +31,16 @@ */ public class NewFileWizardPage2 extends WizardPage { - private FileSelectionGroup fResourceComposite; - private String processName; + private FileSelectionGroup fResourceComposite; + private String processName; -/** - * New File Wizard, page 2. - * - * @param pageName - */ - -public NewFileWizardPage2(String pageName) + /** + * New File Wizard, page 2. + * + * @param pageName + */ + + public NewFileWizardPage2(String pageName) { super(pageName); setPageComplete(false); @@ -70,12 +70,6 @@ public void handleEvent(Event event) { IResource resource = fResourceComposite.getSelectedResource(); setPageComplete(validatePage(resource)); - // 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); } @@ -89,17 +83,22 @@ } private boolean validatePage(IResource resource){ - boolean validate = false; - validate = (resource != null && resource instanceof IContainer); - if(validate){ + if (resource instanceof IContainer) { IContainer container = (IContainer)resource; + // https://issues.jboss.org/browse/JBIDE-8591 + if (!ModuleCoreNature.isFlexibleProject(resource.getProject())) { + setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING); + return false; + } + if ( container.findMember(processName +".bpel") != null ) { //$NON-NLS-1$ - setMessage(Messages.NewFileWizardPage1_12,WARNING); - } else { - setMessage(null); + setMessage(Messages.NewFileWizardPage1_12, WizardPage.ERROR); + return false; } + setMessage(null); + return true; } - return validate; + return false; } /** @@ -118,4 +117,23 @@ public void setProcessName(String processName) { this.processName = processName; } + + @Override + public boolean isPageComplete() { + + IContainer container = getResourceContainer(); + if (container==null) + return false; + + if (!ModuleCoreNature.isFlexibleProject(container.getProject())) + return false; + + if ( container.findMember(processName +".bpel") != null ) //$NON-NLS-1$ + return false; + + if (!super.isPageComplete()) + return false; + + return true; + } }