Author: adietish Date: 2012-04-30 12:22:51 -0400 (Mon, 30 Apr 2012) New Revision: 40656 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java Log: [JBIDE-11505] setting application scale for existing application Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-30 16:16:33 UTC (rev 40655) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-30 16:22:51 UTC (rev 40656) @@ -305,17 +305,18 @@ .to(selectedGearProfileModelObservable) .converting(new GearProfileToStringConverter()) .in(dbc); - + // scaling this.enableScalingButton = new Button(newAppConfigurationGroup, SWT.CHECK); enableScalingButton.setText("Enable scaling"); IObservableValue enableScalingModelObservable = BeanProperties.value( ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_SCALE).observe(pageModel); final IObservableValue enableScalingButtonSelection = WidgetProperties.selection().observe(enableScalingButton); - ValueBindingBuilder.bind(enableScalingButtonSelection).converting(new BooleanToApplicationScaleConverter()) - .to(enableScalingModelObservable).converting(new ApplicationScaleToBooleanConverter()).in(dbc); - - + ValueBindingBuilder + .bind(enableScalingButtonSelection).converting(new BooleanToApplicationScaleConverter()) + .to(enableScalingModelObservable).converting(new ApplicationScaleToBooleanConverter()) + .in(dbc); + // embeddable cartridges this.newAppEmbeddableCartridgesGroup = new Group(newAppConfigurationGroup, SWT.NONE); newAppEmbeddableCartridgesGroup.setText("Embeddable Cartridges"); @@ -411,7 +412,7 @@ new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), new UpdateListStrategy().setConverter(new GearProfileToStringConverter())); } - + protected CheckboxTableViewer createTable(Composite tableContainer) { Table table = new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK); @@ -619,7 +620,7 @@ return null; } } - + private static final class GearProfileToStringConverter extends Converter { private GearProfileToStringConverter() { super(Object.class, String.class); @@ -647,7 +648,7 @@ return null; } } - + private static final class ApplicationScaleToBooleanConverter extends Converter { private ApplicationScaleToBooleanConverter() { super(Object.class, Boolean.class); @@ -658,7 +659,7 @@ if (!(fromObject instanceof ApplicationScale)) { return null; } - switch((ApplicationScale)fromObject) { + switch ((ApplicationScale) fromObject) { case SCALE: return Boolean.TRUE; default: @@ -680,8 +681,7 @@ return null; } } - - + private static class JenkinsApplicationDialog extends InputDialog { public JenkinsApplicationDialog(Shell shell) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-30 16:16:33 UTC (rev 40655) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-30 16:22:51 UTC (rev 40656) @@ -342,6 +342,7 @@ setSelectedCartridge(application.getCartridge()); setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges())); setSelectedGearProfile(application.getGearProfile()); + setApplicationScale(application.getApplicationScale()); wizardModel.setApplication(application); } }