[jbosstools-commits] JBoss Tools SVN: r22055 - in branches/jbosstools-3.1.x: esb/plugins/org.jboss.tools.esb.project.core and 2 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2010-05-13 08:32:34 -0400 (Thu, 13 May 2010)
New Revision: 22055

Modified:
   branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
   branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
   branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
   branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
Log:
JBIDE-6056 branch

Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2010-05-13 12:32:34 UTC (rev 22055)
@@ -769,7 +769,7 @@
          	id="org.jboss.ide.eclipse.as.runtime.component"
          	version="6.0"/>
        <facet id="jst.web"  version="2.2,2.3,2.4,2.5"/>
-       <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+       <facet id="jst.java" version="5.0,6.0"/>
        <facet id="jst.utility" version="1.0"/>
        <facet id="jst.connector" version="1.0,1.5"/>
        <facet id="jst.ejb" version="2.0,2.1,3.0"/>

Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml	2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml	2010-05-13 12:32:34 UTC (rev 22055)
@@ -151,7 +151,7 @@
          </facet>
          <runtime-component
                id="org.jboss.ide.eclipse.as.runtime.component"
-               version="4.2,5.0,5.1">
+               version="4.2,5.0,5.1,6.0">
          </runtime-component>
       </supported>
       <supported>

Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java	2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java	2010-05-13 12:32:34 UTC (rev 22055)
@@ -11,6 +11,7 @@
 package org.jboss.tools.esb.project.ui.wizards;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -31,7 +32,11 @@
 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.IFacetedProjectTemplate;
+import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 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.runtime.IRuntime;
 import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
@@ -48,6 +53,13 @@
 
 	public ESBProjectWizard() {
 		super();
+		Set<IProjectFacetVersion> current = getFacetedProjectWorkingCopy().getProjectFacets();
+		getFacetedProjectWorkingCopy().addListener(new IFacetedProjectListener(){
+			public void handleEvent(IFacetedProjectEvent event) {
+				System.out.println("runtime changed" + event.getWorkingCopy().getPrimaryRuntime().getName());
+			}}, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED);
+		IRuntime rt = getFacetedProjectWorkingCopy().getPrimaryRuntime();
+		getFacetedProjectWorkingCopy().setProjectFacets(current);
 		setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title);
 		setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT));
 	}
@@ -64,6 +76,14 @@
 		return DataModelFactory.createDataModel(new JBossESBFacetProjectCreationDataModelProvider());
 	}
 
+    private IFacetedProjectWorkingCopy fpjwc;
+    
+    @Override
+    public void setFacetedProjectWorkingCopy( final IFacetedProjectWorkingCopy fpjwc ) {
+		super.setFacetedProjectWorkingCopy(fpjwc);
+        this.fpjwc = fpjwc;
+    }
+
 	@Override
 	protected IWizardPage createFirstPage() {
 		return new ESBProjectFirstPage(model, "first.page"); //$NON-NLS-1$

Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java	2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java	2010-05-13 12:32:34 UTC (rev 22055)
@@ -41,8 +41,12 @@
 		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);
+//	}
+	protected void createPrimaryFacetComposite(Composite top) {
+		super.createPrimaryFacetComposite(top);
+		super.handlePrimaryFacetVersionSelectedEvent();
 	}
 
 	@Override