Author: dennyxu Date: 2008-09-19 04:59:14 -0400 (Fri, 19 Sep 2008) New Revision: 10375 Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/ trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java Log: JBIDE-2793: add icon and image to esb project wizard JBIDE-2738: java.lang.ClassCastException when select JBoss esb while creating the project. Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-09-19 05:42:06 UTC (rev 10374) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-09-19 08:59:14 UTC (rev 10375) @@ -29,5 +29,6 @@ org.eclipse.jst.j2ee.core;bundle-version="1.1.200", org.eclipse.jst.j2ee.ui;bundle-version="1.1.200", org.eclipse.jdt.core;bundle-version="3.4.0", - org.jboss.tools.esb.project.core;bundle-version="1.0.0" + org.jboss.tools.esb.project.core;bundle-version="1.0.0", + org.jboss.tools.common.model.ui;bundle-version="2.0.0" Eclipse-LazyStart: true Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif =================================================================== (Binary files differ) Property changes on: trunk/esb/plugins/org.jboss.tools.esb.project.ui/icons/wizards/esb.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-19 05:42:06 UTC (rev 10374) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-19 08:59:14 UTC (rev 10375) @@ -7,6 +7,7 @@ <wizard category="org.jboss.tools.esb.category1" class="org.jboss.tools.esb.project.ui.wizards.ESBProjectWizard" + icon="icons/wizards/esb.gif" id="JBoss.ESB.Project.Wizard" name="ESB Project Wizard" project="true"> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-09-19 05:42:06 UTC (rev 10374) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2008-09-19 08:59:14 UTC (rev 10375) @@ -1,18 +1,14 @@ package org.jboss.tools.esb.project.ui.wizards; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties; -import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard; +import org.jboss.tools.common.model.ui.ModelUIImages; import org.jboss.tools.esb.core.ESBProjectUtilities; import org.jboss.tools.esb.project.ui.wizards.pages.ESBProjectFirstPage; @@ -21,11 +17,13 @@ public ESBProjectWizard() { setWindowTitle("New ESB Project Wizard"); + setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); } public ESBProjectWizard(IDataModel model) { super(model); setWindowTitle("New ESB Project Wizard"); + setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); } @@ -41,7 +39,7 @@ @Override protected ImageDescriptor getDefaultPageImageDescriptor() { - return null; + return ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT); } @Override @@ -51,4 +49,4 @@ -} +} \ No newline at end of file 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 2008-09-19 05:42:06 UTC (rev 10374) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2008-09-19 08:59:14 UTC (rev 10375) @@ -8,8 +8,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jst.common.project.facet.JavaFacetUtils; import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig; @@ -27,7 +25,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy; @@ -36,16 +33,13 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener; -import org.eclipse.wst.common.project.facet.core.internal.ValidationProblem.Type; import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage; import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage; -import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard; import org.jboss.tools.esb.core.ESBProjectUtilities; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; import org.jboss.tools.esb.core.runtime.JBossRuntime; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; import org.jboss.tools.esb.project.ui.preference.controls.JBossRuntimeListFieldEditor; -import org.jboss.tools.esb.project.ui.wizards.ESBProjectWizard; public class ESBFacetInstallationPage extends AbstractFacetWizardPage implements IFacetWizardPage, IJBossESBFacetDataModelProperties { @@ -68,7 +62,9 @@ private void setDefaultOutputFolder(){ JavaFacetInstallConfig cfg = findJavaFacetInstallConfig(); - cfg.setDefaultOutputFolder(new Path(ESBProjectUtilities.BUILD_CLASSES)); + if(cfg != null){ + cfg.setDefaultOutputFolder(new Path(ESBProjectUtilities.BUILD_CLASSES)); + } } protected Composite createTopLevelComposite(Composite parent) { @@ -159,16 +155,12 @@ private IFacetedProjectWorkingCopy getFacetedProjectWorkingCopy(){ - IWizard wizard = this.getWizard(); - if(wizard instanceof NewProjectDataModelFacetWizard){ - IDataModel wModel = ((NewProjectDataModelFacetWizard)wizard).getDataModel(); - final IFacetedProjectWorkingCopy fpjwc - = (IFacetedProjectWorkingCopy) wModel.getProperty( FACETED_PROJECT_WORKING_COPY ); - return fpjwc; + Object obj = model.getProperty(FACETED_PROJECT_WORKING_COPY); + if(obj instanceof IFacetedProjectWorkingCopy){ + return (IFacetedProjectWorkingCopy)obj; } - else{ - return null; - } + + return null; } private JavaFacetInstallConfig findJavaFacetInstallConfig() { @@ -178,6 +170,8 @@ final IFacetedProject.Action javaInstallAction = fpjwc.getProjectFacetAction( JavaFacetUtils.JAVA_FACET ); + if(javaInstallAction == null) return null; + final Object config = javaInstallAction.getConfig(); if( config instanceof JavaFacetInstallConfig ) @@ -238,6 +232,9 @@ } }); + if("".equals(cmbRuntimes.getText())){ + hasRuntime = false; + } /*Composite chkcom = new Composite(runtimeGroup, SWT.NONE); chkcom.setLayout(new GridLayout(3, true)); chkcom.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -337,9 +334,12 @@ private IProjectFacetVersion getSelectedESBVersion(){ IFacetedProjectWorkingCopy fpwc = getFacetedProjectWorkingCopy(); IProjectFacet facet = ProjectFacetsManager.getProjectFacet(ESBProjectUtilities.ESB_PROJECT_FACET); + if(fpwc != null){ + return fpwc.getProjectFacetVersion(facet); + }else{ + return null; + } - return fpwc.getProjectFacetVersion(facet); - } protected void saveJBosswsRuntimeToModel(JBossRuntime jbws) { @@ -387,6 +387,9 @@ setErrorMessage("Please specify a valid source folder."); hasValidSrc = false; setPageComplete(isPageComplete()); + }else if(!hasRuntime){ + setErrorMessage("Please specify a ESB runtime"); + setPageComplete(isPageComplete()); } /* else if (!duplicateMsg.equals("")) { setErrorMessage("Duplicated jar on classpath:" + duplicateMsg); @@ -408,14 +411,14 @@ } - private void fillMessageGroup(Composite parent){ +/* private void fillMessageGroup(Composite parent){ Group messageGroup = new Group(parent, SWT.BORDER); messageGroup.setText("Target Message Product"); messageGroup.setLayout(new GridLayout(1, false)); messageGroup.setLayoutData(new GridData(GridData.FILL_BOTH)); } - +*/ public void setConfig(Object config) { this.model = (IDataModel)config; @@ -434,4 +437,4 @@ } -} +} \ No newline at end of file