Author: dennyxu Date: 2009-12-25 04:20:03 -0500 (Fri, 25 Dec 2009) New Revision: 19582 Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-5540: New ESB Project Wizard - Late Error Message: "Please specify the project primary target runtime" Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java =================================================================== --- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2009-12-24 19:54:08 UTC (rev 19581) +++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossClassPathCommand.java 2009-12-25 09:20:03 UTC (rev 19582) @@ -95,6 +95,9 @@ private String getProjectTargetRuntimeID(IProject project) throws CoreException{ IFacetedProject fp = ProjectFacetsManager.create(project); IRuntime runtime = fp.getPrimaryRuntime(); + if(runtime == null){ + return ""; + } return runtime.getProperty("id"); } Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties =================================================================== --- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-24 19:54:08 UTC (rev 19581) +++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-12-25 09:20:03 UTC (rev 19582) @@ -53,7 +53,7 @@ ESBFacetInstallationPage_Button_Text_New=New ESBFacetInstallationPage_Default_SRC_Folder=src ESBFacetInstallationPage_Description=Configure project structure and classpath -ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime=Please specify the project primary target runtime +ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime=The project primary target runtime is not specified, Server supplied ESB runtime will not be installed correctly. ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime=The specified target runtime does not contain a valid ESB {0} runtime . ESBFacetInstallationPage_Error_Message_No_Target_Runtime=No target runtime was specified. ESBFacetInstallationPage_Error_Message_Specify_Content_Folder=Please specify a valid content folder. Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java =================================================================== --- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-12-24 19:54:08 UTC (rev 19581) +++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-12-25 09:20:03 UTC (rev 19582) @@ -358,8 +358,8 @@ if (ifpwc != null) { IRuntime runtime = ifpwc.getPrimaryRuntime(); if (runtime == null) { - setErrorMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime); - hasRuntime = false; + setMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime, WARNING); + hasRuntime = true; setPageComplete(isPageComplete()); return false; } Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java =================================================================== --- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2009-12-24 19:54:08 UTC (rev 19581) +++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2009-12-25 09:20:03 UTC (rev 19582) @@ -13,8 +13,10 @@ import java.util.HashSet; import java.util.Set; +import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil; +import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; @@ -39,9 +41,9 @@ return ESBProjectConstant.ESB_PROJECT_FACET; } - protected void createPresetPanel(Composite top) { - new Label(top, SWT.NONE); - } +// protected void createPresetPanel(Composite top) { +// new Label(top, SWT.NONE); +// } @Override protected void validatePage() { @@ -55,6 +57,11 @@ } + protected IDialogSettings getDialogSettings() { + return J2EEUIPlugin.getDefault().getDialogSettings(); + } + + @Override protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion ) {