Author: dennyxu Date: 2010-08-02 01:28:57 -0400 (Mon, 02 Aug 2010) New Revision: 23857 Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java Log: JBIDE-6698: ESB Project Wizard: source folder in 'Java' and 'Install ESB Facet' views are not synced Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2010-08-02 01:52:08 UTC (rev 23856) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2010-08-02 05:28:57 UTC (rev 23857) @@ -68,8 +68,6 @@ public class ESBFacetInstallationPage extends AbstractFacetWizardPage implements IFacetWizardPage, IJBossESBFacetDataModelProperties { - private Label configFolderLabel; - private Text configFolder; private Label contextRootLabel; private Text contentFolder; private IDataModel model; @@ -178,35 +176,9 @@ } }); - configFolderLabel = new Label(prjGroup, SWT.NONE); - configFolderLabel.setText(JBossESBUIMessages.ESBFacetInstallationPage_Label_Source_Directory); - configFolderLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - configFolder = new Text(prjGroup, SWT.BORDER); - configFolder.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - configFolder.setData("label", configFolderLabel); //$NON-NLS-1$ - configFolder.setText(JBossESBUIMessages.ESBFacetInstallationPage_Default_SRC_Folder); - configFolder.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e){ - String srcFolder = configFolder.getText(); - if(srcFolder != null && !srcFolder.equals("")){ //$NON-NLS-1$ - model.setProperty(ESB_SOURCE_FOLDER, srcFolder); - setConfigFolder(srcFolder); - } - changePageStatus(); - } - - }); } - private void setConfigFolder(String folderName){ - JavaFacetInstallConfig cfg = findJavaFacetInstallConfig(); - if(cfg != null){ - cfg.setSourceFolder(new Path(folderName)); - } - } - private IFacetedProjectWorkingCopy getFacetedProjectWorkingCopy(){ Object obj = model.getProperty(IFacetDataModelProperties.FACETED_PROJECT_WORKING_COPY); if(obj instanceof IFacetedProjectWorkingCopy){ @@ -543,11 +515,12 @@ hasValidContentFolder = false; setPageComplete(isPageComplete()); } - else if(!validFolderName(configFolder.getText())){ - setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Specify_Source_Folder); - hasValidSrc = false; - setPageComplete(isPageComplete()); - }else if(btnUserSupplied.getSelection() && !hasRuntime){ +// else if(!validFolderName(configFolder.getText())){ +// setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Specify_Source_Folder); +// hasValidSrc = false; +// setPageComplete(isPageComplete()); +// } + else if(btnUserSupplied.getSelection() && !hasRuntime){ setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Specify_ESB_Runtime); setPageComplete(isPageComplete()); }else if(btnServerSupplied.getSelection() && !checkServerSuppliedESBRuntime()){