[jbosstools-commits] JBoss Tools SVN: r8978 - in trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui: widgets and 1 other directory.

Author: dennyxu Date: 2008-06-27 02:07:21 -0400 (Fri, 27 Jun 2008) New Revision: 8978 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java Log: JBIDE-2262: if the user don't configure the facet on the page, do not allow him to add the facet to the project Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-27 05:26:45 UTC (rev 8977) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-06-27 06:07:21 UTC (rev 8978) @@ -22,7 +22,6 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.core.JavaProject; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; @@ -75,6 +74,22 @@ this.model = (IDataModel) config; } + + private void setInitialValues(){ + boolean isServerSupplied = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED); + String runtimeName = model.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID); + boolean isDeploy = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY); + if(isServerSupplied){ + btnServerSupplied.setSelection(true); + }else if(runtimeName != null && !runtimeName.equals("")){ + btnUserSupplied.setSelection(true); + if(isDeploy){ + btnDeploy.setSelection(true); + } + } + initializeRuntimesCombo(cmbRuntimes, runtimeName); + + } public void createControl(Composite parent) { initializeDialogUnits(parent); @@ -108,6 +123,7 @@ lblServerSupplied.setLayoutData(gd); btnUserSupplied = new Button(composite, SWT.RADIO); + btnUserSupplied.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserSuppliedSelection(e); @@ -115,7 +131,6 @@ }); cmbRuntimes = new Combo(composite, SWT.READ_ONLY); - initializeRuntimesCombo(cmbRuntimes); cmbRuntimes.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); cmbRuntimes.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -144,7 +159,8 @@ changePageStatus(); } }); - + + setInitialValues(); setControl(composite); changePageStatus(); @@ -216,7 +232,11 @@ } - protected void initializeRuntimesCombo(Combo cmRuntime) { + protected void initializeRuntimesCombo(Combo cmRuntime, String runtimeName) { + JbossWSRuntime selectedJbws = null; + JbossWSRuntime defaultJbws = null; + int selectIndex = 0; + int defaultIndex = 0; cmRuntime.removeAll(); JbossWSRuntime[] runtimes = JbossWSRuntimeManager.getInstance() .getRuntimes(); @@ -224,13 +244,25 @@ JbossWSRuntime jr = runtimes[i]; cmRuntime.add(jr.getName()); cmRuntime.setData(jr.getName(), jr); - + + if(jr.getName().equals(runtimeName)){ + selectedJbws = jr; + selectIndex = i; + } // get default jbossws runtime if (jr.isDefault()) { - cmRuntime.select(i); - saveJBosswsRuntimeToModel(jr); + defaultJbws = jr; + defaultIndex = i; } } + + if(selectedJbws != null){ + cmRuntime.select(selectIndex); + saveJBosswsRuntimeToModel(selectedJbws); + }else{ + cmRuntime.select(defaultIndex); + saveJBosswsRuntimeToModel(defaultJbws); + } } /* @@ -254,7 +286,7 @@ WizardDialog dialog = new WizardDialog(Display.getCurrent() .getActiveShell(), newRtwizard); if (dialog.open() == WizardDialog.OK) { - initializeRuntimesCombo(cmbRuntimes); + initializeRuntimesCombo(cmbRuntimes, null); //cmbRuntimes.select(0); } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java 2008-06-27 05:26:45 UTC (rev 8977) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/ProviderInvokeCodeGenConfigWidget.java 2008-06-27 06:07:21 UTC (rev 8978) @@ -14,7 +14,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button;